From cbb4c4cfb639c2ab31527fffa3b7305b092873e9 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Sat, 8 Oct 2022 22:31:13 +0300 Subject: [PATCH] 2.0.11 --- MyxCMake/MyxCMakeConfigVersion.cmake | 2 +- MyxCMake/lib/macro/SkipExternalTarget.cmake | 2 +- README.md | 2 +- VERSION | 2 +- debian/CMakeLists.txt | 2 +- debian/changelog | 2 +- myx_setup.cmake | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/MyxCMake/MyxCMakeConfigVersion.cmake b/MyxCMake/MyxCMakeConfigVersion.cmake index 05b6e4c..1dc8a69 100644 --- a/MyxCMake/MyxCMakeConfigVersion.cmake +++ b/MyxCMake/MyxCMakeConfigVersion.cmake @@ -1,4 +1,4 @@ -set(MYX_CMAKE_PACKAGE_VERSION "2.0.10") +set(MYX_CMAKE_PACKAGE_VERSION "2.0.11") if(MYX_CMAKE_PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION) set(PACKAGE_VERSION_COMPATIBLE FALSE) else() diff --git a/MyxCMake/lib/macro/SkipExternalTarget.cmake b/MyxCMake/lib/macro/SkipExternalTarget.cmake index aa286f0..f272014 100644 --- a/MyxCMake/lib/macro/SkipExternalTarget.cmake +++ b/MyxCMake/lib/macro/SkipExternalTarget.cmake @@ -5,7 +5,7 @@ macro(myx_skip_external_target NAME) get_target_property(__type ${NAME} TYPE) if(__type STREQUAL "INTERFACE_LIBRARY") get_target_property(__sources ${NAME} INTERFACE_SOURCES) - foreach(iter ${_sources}) + foreach(iter ${__sources}) string(FIND ${iter} ${CMAKE_BINARY_DIR} __pos) if(__pos EQUAL 0) unset(__type) diff --git a/README.md b/README.md index 3ff2f54..51b8d99 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ ## Установка В корневом каталоге проекта создать каталог `cmake` и распаковать в него -[архив](../../../releases/download/2.0.10/myx-cmake-local-2.0.10.tar.xz ). +[архив](../../../releases/download/2.0.11/myx-cmake-local-2.0.11.tar.xz ). ## Использование diff --git a/VERSION b/VERSION index 0a69206..6cbacdc 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0.10 +2.0.11 diff --git a/debian/CMakeLists.txt b/debian/CMakeLists.txt index 1ad0e0e..be54c23 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.10 LANGUAGES) +project(myx-cmake VERSION 2.0.11 LANGUAGES) include(GNUInstallDirs) file(WRITE ${CMAKE_SOURCE_DIR}/MyxCMake/MyxCMakeConfigVersion.cmake diff --git a/debian/changelog b/debian/changelog index 66f81ea..0492f89 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -myx-cmake (2.0.10) unstable; urgency=medium +myx-cmake (2.0.11) unstable; urgency=medium * New version. diff --git a/myx_setup.cmake b/myx_setup.cmake index 110d461..6062236 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.10 REQUIRED CONFIG PATHS ${MYX_CMAKE_DIR} NO_DEFAULT_PATH) + find_package(MyxCMake 2.0.11 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.10 REQUIRED) + find_package(MyxCMake 2.0.11 REQUIRED) myx_message_notice("=== MyxCMake directory: ${MyxCMake_CONFIG} ===") else() include(${PROJECT_SOURCE_DIR}/cmake/myx/MyxCMakeConfig.cmake)