diff --git a/MyxCMake/MyxCMakeConfigVersion.cmake b/MyxCMake/MyxCMakeConfigVersion.cmake index 0bc2786..c804db4 100644 --- a/MyxCMake/MyxCMakeConfigVersion.cmake +++ b/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() diff --git a/MyxCMake/lib/Qt5TargetSetup.cmake b/MyxCMake/lib/Qt5TargetSetup.cmake index 6b46671..980d786 100644 --- a/MyxCMake/lib/Qt5TargetSetup.cmake +++ b/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 - OPTIONS -I ${PROJECT_SOURCE_DIR}/include") + "${PROJECT_SOURCE_DIR}/l10n/${NAME}_${iter}.ts" + OPTIONS -I ${PROJECT_SOURCE_DIR}/include) # Добавление записи для скомпилированного файла переводов в ресурсный файл file(APPEND ${PROJECT_BINARY_DIR}/${NAME}_l10n.qrc "${NAME}_${iter}.qm\n") diff --git a/MyxCMake/lib/macro/SkipExternalTarget.cmake b/MyxCMake/lib/macro/SkipExternalTarget.cmake new file mode 100644 index 0000000..4996b92 --- /dev/null +++ b/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) diff --git a/README.md b/README.md index 45e5534..78dfd2c 100644 --- a/README.md +++ b/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 ). ## Использование diff --git a/VERSION b/VERSION index 815e68d..09843e3 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0.8 +2.0.9 diff --git a/debian/CMakeLists.txt b/debian/CMakeLists.txt index 5246793..e9cd0bc 100644 --- a/debian/CMakeLists.txt +++ b/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 diff --git a/debian/changelog b/debian/changelog index 36c39f7..7c1972f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -myx-cmake (2.0.8) unstable; urgency=medium +myx-cmake (2.0.9) unstable; urgency=medium * New version. diff --git a/myx_setup.cmake b/myx_setup.cmake index fc93dbf..4b66806 100644 --- a/myx_setup.cmake +++ b/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)