diff --git a/MyxCMake/MyxCMakeConfigVersion.cmake b/MyxCMake/MyxCMakeConfigVersion.cmake index 811def1..a4550aa 100644 --- a/MyxCMake/MyxCMakeConfigVersion.cmake +++ b/MyxCMake/MyxCMakeConfigVersion.cmake @@ -1,4 +1,4 @@ -set(MYX_CMAKE_PACKAGE_VERSION "2.0.5") +set(MYX_CMAKE_PACKAGE_VERSION "2.0.6") if(MYX_CMAKE_PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION) set(PACKAGE_VERSION_COMPATIBLE FALSE) else() diff --git a/MyxCMake/lib/FetchContentAdd.cmake b/MyxCMake/lib/FetchContentAdd.cmake index 1b40ac2..a8a2424 100644 --- a/MyxCMake/lib/FetchContentAdd.cmake +++ b/MyxCMake/lib/FetchContentAdd.cmake @@ -51,7 +51,9 @@ function(FetchContent_Add NAME) GIT_SHALLOW 1 ) - if(NOT ${NAME}_POPULATED) + string(TOLOWER ${NAME} lower_name) + FetchContent_GetProperties(${NAME}) + if(NOT ${lower_name}_POPULATED) FetchContent_Populate(${NAME}) add_subdirectory(${${NAME}_SOURCE_DIR} ${${NAME}_BINARY_DIR}) endif() diff --git a/README.md b/README.md index 7a23ec3..d82eca5 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ ## Установка В корневом каталоге проекта создать каталог `cmake` и распаковать в него -[архив](../../../releases/download/2.0.5/myx-cmake-local-2.0.5.tar.xz ). +[архив](../../../releases/download/2.0.6/myx-cmake-local-2.0.6.tar.xz ). ## Использование diff --git a/VERSION b/VERSION index e010258..157e54f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0.5 +2.0.6 diff --git a/debian/CMakeLists.txt b/debian/CMakeLists.txt index a67a5e7..44cfc18 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.5 LANGUAGES) +project(myx-cmake VERSION 2.0.6 LANGUAGES) include(GNUInstallDirs) file(WRITE ${CMAKE_SOURCE_DIR}/MyxCMake/MyxCMakeConfigVersion.cmake diff --git a/debian/changelog b/debian/changelog index d0e5bf2..47802fe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -myx-cmake (2.0.5) unstable; urgency=medium +myx-cmake (2.0.6) unstable; urgency=medium * New version. diff --git a/myx_setup.cmake b/myx_setup.cmake index 8765059..173bad6 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.5 REQUIRED CONFIG PATHS ${MYX_CMAKE_DIR} NO_DEFAULT_PATH) + find_package(MyxCMake 2.0.6 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.5 REQUIRED) + find_package(MyxCMake 2.0.6 REQUIRED) myx_message_notice("=== MyxCMake directory: ${MyxCMake_CONFIG} ===") else() include(${PROJECT_SOURCE_DIR}/cmake/myx/MyxCMakeConfig.cmake)