2.0.9

MyxCMake/MyxCMakeConfigVersion.cmake

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

MyxCMake/lib/Qt5TargetSetup.cmake

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

MyxCMake/lib/macro/SkipExternalTarget.cmake

@@ -0,0 +1,14 @@
+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)
+    unset(__pos)
+    unset(__source_dir)
+    return()
+  endif()
+  unset(__pos)
+  unset(__source_dir)
+endmacro(myx_skip_external_target NAME)

README.md

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

VERSION

@@ -1 +1 @@
-2.0.8
+2.0.9

debian/CMakeLists.txt

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

debian/changelog

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