diff --git a/MyxCMake/MyxCMakeConfigVersion.cmake b/MyxCMake/MyxCMakeConfigVersion.cmake index d612ee6..c432434 100644 --- a/MyxCMake/MyxCMakeConfigVersion.cmake +++ b/MyxCMake/MyxCMakeConfigVersion.cmake @@ -1,4 +1,4 @@ -set(MYX_CMAKE_PACKAGE_VERSION "2.4.13") +set(MYX_CMAKE_PACKAGE_VERSION "2.4.14") if(MYX_CMAKE_PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION) set(PACKAGE_VERSION_COMPATIBLE FALSE) else() diff --git a/MyxCMake/lib/DownloadContent.cmake b/MyxCMake/lib/DownloadContent.cmake index 66d3bb9..9cd4059 100644 --- a/MyxCMake/lib/DownloadContent.cmake +++ b/MyxCMake/lib/DownloadContent.cmake @@ -28,7 +28,9 @@ find_package(Git QUIET) option(ENABLE_DOWNLOAD_CONTENT "Enable download content" ON) -include(${MYX_CMAKE_BACKPORTS_DIR}/TopLevelProject.cmake) +if(CMAKE_SCRIPT_MODE_FILE) + include(${CMAKE_CURRENT_LIST_DIR}/ProjectIsTopLevel.cmake) +endif() function(myx_download_content NAME) set(options AUTOFETCH AUTOPULL) @@ -36,9 +38,7 @@ function(myx_download_content NAME) set(multiValueArgs DOWNLOAD_DIR GIT_REPOSITORY GIT_TAG) cmake_parse_arguments(ARG "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) - if(CMAKE_SCRIPT_MODE_FILE) - include(${CMAKE_CURRENT_LIST_DIR}/ProjectIsTopLevel.cmake) - else() + if(NOT CMAKE_SCRIPT_MODE_FILE) if(TARGET myx-download-${NAME}) return() else() diff --git a/README.md b/README.md index 8c107ff..6022fbc 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ ## Установка В корневом каталоге проекта создать каталог `cmake` и распаковать в него -[архив](../../../releases/download/2.4.13/myx-cmake-local-2.4.13.tar.xz ). +[архив](../../../releases/download/2.4.14/myx-cmake-local-2.4.14.tar.xz ). ## Использование diff --git a/VERSION b/VERSION index b40e924..e5f3129 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.4.13 +2.4.14 diff --git a/debian/CMakeLists.txt b/debian/CMakeLists.txt index d8b56c5..ba7c116 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.4.13 LANGUAGES) +project(myx-cmake VERSION 2.4.14 LANGUAGES) include(GNUInstallDirs) file(WRITE ${CMAKE_SOURCE_DIR}/MyxCMake/MyxCMakeConfigVersion.cmake diff --git a/debian/changelog b/debian/changelog index eb18252..440724e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -myx-cmake (2.4.13) unstable; urgency=medium +myx-cmake (2.4.14) unstable; urgency=medium * New version. diff --git a/myx_setup.cmake b/myx_setup.cmake index 9105e80..eb75f4b 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.4.13 REQUIRED CONFIG PATHS ${MYX_CMAKE_DIR} NO_DEFAULT_PATH) + find_package(MyxCMake 2.4.14 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.4.13 REQUIRED) + find_package(MyxCMake 2.4.14 REQUIRED) myx_message_notice("== MyxCMake directory: ${MyxCMake_CONFIG} ==") else() include(${PROJECT_SOURCE_DIR}/cmake/myx/MyxCMakeConfig.cmake)