2.4.18

MyxCMake/MyxCMakeConfigVersion.cmake

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

MyxCMake/lib/TargetSetupQt.cmake

@@ -33,6 +33,8 @@ function(myx_target_setup_qt TARGET_NAME)
       endif()
       if((${CMAKE_VERSION} VERSION_GREATER "3.8.0") AND (__target_type STREQUAL "OBJECT_LIBRARY"))
         target_link_libraries(${TARGET_NAME} PUBLIC Qt${myx_qt_ver}::${iter})
+      else()
+        target_include_directories(${TARGET_NAME} PUBLIC ${Qt${myx_qt_ver}${iter}_INCLUDE_DIRS})
       endif()
     endif()
   endforeach()
@@ -148,6 +150,6 @@ function(myx_target_setup_qt TARGET_NAME)
       FILES ${ARG_PUBLIC_MOC}
       DESTINATION ${CMAKE_INSTALL_PREFIX}
       COMPONENT DEV
-     )
+    )
   endif()
 endfunction()

MyxCMake/lib/generators/PrivateConfigHeader.cmake

@@ -31,5 +31,10 @@ function(myx_generate_private_config_header TARGET_NAME BASE_FILENAME)
   configure_file("${CMAKE_CURRENT_FUNCTION_LIST_DIR}/PrivateConfig.hpp.in" ${__filename})
 
   set_property(TARGET ${TARGET_NAME} APPEND PROPERTY PRIVATE_HEADER_FILES ${__filename})
-  target_sources(${TARGET_NAME} PRIVATE ${__filename})
+  get_target_property(__target_type ${TARGET_NAME} TYPE)
+  if(${__target_type} STREQUAL "INTERFACE_LIBRARY")
+    target_sources(${TARGET_NAME} INTERFACE ${__filename})
+  else()
+    target_sources(${TARGET_NAME} PRIVATE ${__filename})
+  endif()
 endfunction()

README.md

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

VERSION

@@ -1 +1 @@
-2.4.17
+2.4.18

debian/CMakeLists.txt

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

debian/changelog

@@ -1,4 +1,4 @@
-myx-cmake (2.4.17) unstable; urgency=medium
+myx-cmake (2.4.18) 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.17 REQUIRED CONFIG PATHS ${MYX_CMAKE_DIR} NO_DEFAULT_PATH)
+  find_package(MyxCMake 2.4.18 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.17 REQUIRED)
+    find_package(MyxCMake 2.4.18 REQUIRED)
     myx_message_notice("== MyxCMake directory: ${MyxCMake_CONFIG} ==")
   else()
     include(${PROJECT_SOURCE_DIR}/cmake/myx/MyxCMakeConfig.cmake)