2.0.10

MyxCMake/MyxCMakeConfigVersion.cmake

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

MyxCMake/lib/CurrentDate.cmake

@@ -1,7 +1,7 @@
 include_guard(GLOBAL)
 
 if(NOT MYX_TODAY)
-  if(WIN32)
+  if(CMAKE_HOST_SYSTEM_NAME STREQUAL Windows)
     execute_process(COMMAND "cmd" " /C date /T" OUTPUT_VARIABLE MYX_TODAY)
   else()
     execute_process(COMMAND "date" "+%d/%m/%Y" OUTPUT_VARIABLE MYX_TODAY)
@@ -10,7 +10,7 @@ if(NOT MYX_TODAY)
 endif()
 
 if(NOT MYX_YEAR)
-  if(WIN32)
+  if(CMAKE_HOST_SYSTEM_NAME STREQUAL Windows)
     execute_process(COMMAND "cmd" " /C date /T" OUTPUT_VARIABLE MYX_YEAR)
   else()
     execute_process(COMMAND "date" "+%d/%m/%Y" OUTPUT_VARIABLE MYX_YEAR)

MyxCMake/lib/Qt5TargetSetup.cmake

@@ -73,7 +73,7 @@ function(myx_qt5_target_setup NAME)
       # и его компиляция в каталог ${PROJECT_BINARY_DIR}
       qt5_create_translation(qm ${tr}
         "${PROJECT_SOURCE_DIR}/l10n/${NAME}_${iter}.ts"
-        OPTIONS -I ${PROJECT_SOURCE_DIR}/include)
+        OPTIONS -I ${PROJECT_SOURCE_DIR}/include -I ${PROJECT_SOURCE_DIR}/include/${PROJECT_NAME})
       # Добавление записи для скомпилированного файла переводов в ресурсный файл
       file(APPEND ${PROJECT_BINARY_DIR}/${NAME}_l10n.qrc
         "<file alias=\"${NAME}_${iter}\">${NAME}_${iter}.qm</file>\n")

MyxCMake/lib/macro/SkipExternalTarget.cmake

@@ -2,13 +2,32 @@ include_guard(GLOBAL)
 
 # Пропуск целей, которые создаются автоматически в `CMAKE_BINARY_DIR`
 macro(myx_skip_external_target NAME)
-  get_target_property(__source_dir ${NAME} SOURCE_DIR)
-  string(FIND ${__source_dir} ${CMAKE_BINARY_DIR} __pos)
-  if(__pos EQUAL 0)
+  get_target_property(__type ${NAME} TYPE)
+  if(__type STREQUAL "INTERFACE_LIBRARY")
+    get_target_property(__sources ${NAME} INTERFACE_SOURCES)
+    foreach(iter ${_sources})
+      string(FIND ${iter} ${CMAKE_BINARY_DIR} __pos)
+      if(__pos EQUAL 0)
+        unset(__type)
+        unset(__pos)
+        unset(__sources)
+        return()
+      endif()
+    endforeach()
+    unset(__type)
+    unset(__pos)
+    unset(__sources)
+  else()
+    get_target_property(__source_dir ${NAME} SOURCE_DIR)
+    string(FIND ${__source_dir} ${CMAKE_BINARY_DIR} __pos)
+    if(__pos EQUAL 0)
+      unset(__type)
+      unset(__pos)
+      unset(__source_dir)
+      return()
+    endif()
     unset(__pos)
     unset(__source_dir)
-    return()
   endif()
-  unset(__pos)
-  unset(__source_dir)
+  unset(__type)
 endmacro(myx_skip_external_target NAME)