2.4.31

Makefile

@@ -15,6 +15,7 @@ v:
 	sed -i "s/VERSION \".*\"/VERSION \"$V\"/" $(TOP_DIR)/MyxCMake/MyxCMakeConfigVersion.cmake
 	sed -i "s/VERSION .* LANG/VERSION $V LANG/" $(TOP_DIR)/debian/CMakeLists.txt
 	sed -i "s/(.*)/($(V))/" $(TOP_DIR)/debian/changelog
+	git commit -a -m "$(V)"
 
 deb:
 	rm -rf $(DEB_DIR)

MyxCMake/MyxCMakeConfigVersion.cmake

@@ -1,4 +1,4 @@
-set(MYX_CMAKE_PACKAGE_VERSION "2.4.28")
+set(MYX_CMAKE_PACKAGE_VERSION "2.4.31")
 if(MYX_CMAKE_PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
   set(PACKAGE_VERSION_COMPATIBLE FALSE)
 else()

MyxCMake/lib/AddInterfaceLibrary.cmake

@@ -59,6 +59,13 @@ function(myx_add_interface_library TARGET_NAME)
     foreach(lib ${ARG_LINK_LIBRARIES})
       if(TARGET ${lib})
         set(exlib ${lib})
+        get_target_property(type ${lib} TYPE)
+        if(type)
+          get_target_property(include_dirs ${lib} INTERFACE_INCLUDE_DIRECTORIES)
+          if(include_dirs)
+            target_include_directories(${TARGET_NAME} INTERFACE ${include_dirs})
+          endif()
+        endif()
         if(${CMAKE_VERSION} VERSION_GREATER "3.13.0")
           install(TARGETS ${lib}
                   EXPORT ${TARGET_NAME}Targets

MyxCMake/lib/TargetSetup.cmake

@@ -75,9 +75,7 @@ function(myx_target_setup TARGET_NAME)
     install(TARGETS ${TARGET_NAME} COMPONENT MAIN RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
   endif()
 
-#  target_sources(${TARGET_NAME} PUBLIC ${ARG_PUBLIC_HEADERS})
   target_sources(${TARGET_NAME} PRIVATE ${ARG_CPP} ${ARG_PCH} ${ARG_PRIVATE_HEADERS})
-  target_sources(${TARGET_NAME} PUBLIC $<BUILD_INTERFACE:${ARG_PUBLIC_HEADERS}>)
   target_compile_definitions(${TARGET_NAME} PRIVATE ${ARG_COMPILE_DEFINITIONS})
   target_include_directories(${TARGET_NAME} PRIVATE ${ARG_INCLUDE_DIRECTORIES})
 

README.md

@@ -3,7 +3,7 @@
 ## Установка
 
 В корневом каталоге проекта создать каталог `cmake` и распаковать в него
-[архив](../../../releases/download/2.4.28/myx-cmake-local-2.4.28.tar.xz ).
+[архив](../../../releases/download/2.4.31/myx-cmake-local-2.4.31.tar.xz ).
 
 ## Использование
 

VERSION

@@ -1 +1 @@
-2.4.28
+2.4.31

debian/CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.6 FATAL_ERROR)
-project(myx-cmake VERSION 2.4.28 LANGUAGES)
+project(myx-cmake VERSION 2.4.31 LANGUAGES)
 
 include(GNUInstallDirs)
 file(WRITE ${CMAKE_SOURCE_DIR}/MyxCMake/MyxCMakeConfigVersion.cmake

debian/changelog

@@ -1,4 +1,4 @@
-myx-cmake (2.4.28) unstable; urgency=medium
+myx-cmake (2.4.31) unstable; urgency=medium
 
   * New version.
 

myx_setup.cmake

@@ -20,11 +20,11 @@ if(ENV{MYX_CMAKE_DIR})
   set(MYX_CMAKE_DIR $ENV{MYX_CMAKE_DIR})
 endif()
 if(MYX_CMAKE_DIR)
-  find_package(MyxCMake 2.4.28 REQUIRED CONFIG PATHS ${MYX_CMAKE_DIR} NO_DEFAULT_PATH)
+  find_package(MyxCMake 2.4.31 REQUIRED CONFIG PATHS ${MYX_CMAKE_DIR} NO_DEFAULT_PATH)
   myx_message_notice("== MyxCMake directory: ${MyxCMake_CONFIG} ==")
 else()
   if(MYX_CMAKE_USE_SYSTEM)
-    find_package(MyxCMake 2.4.28 REQUIRED)
+    find_package(MyxCMake 2.4.31 REQUIRED)
     myx_message_notice("== MyxCMake directory: ${MyxCMake_CONFIG} ==")
   else()
     include(${PROJECT_SOURCE_DIR}/cmake/myx/MyxCMakeConfig.cmake)