From 490b7a82d044af003f6b425879ec937b1adb126b Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Tue, 18 Oct 2022 07:48:16 +0300 Subject: [PATCH] 2.0.22 --- MyxCMake/MyxCMakeConfigVersion.cmake | 2 +- MyxCMake/lib/generators/GitInfoHeader.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 f912664..2b01ee6 100644 --- a/MyxCMake/MyxCMakeConfigVersion.cmake +++ b/MyxCMake/MyxCMakeConfigVersion.cmake @@ -1,4 +1,4 @@ -set(MYX_CMAKE_PACKAGE_VERSION "2.0.21") +set(MYX_CMAKE_PACKAGE_VERSION "2.0.22") if(MYX_CMAKE_PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION) set(PACKAGE_VERSION_COMPATIBLE FALSE) else() diff --git a/MyxCMake/lib/generators/GitInfoHeader.cmake b/MyxCMake/lib/generators/GitInfoHeader.cmake index e064c04..5c4fa37 100644 --- a/MyxCMake/lib/generators/GitInfoHeader.cmake +++ b/MyxCMake/lib/generators/GitInfoHeader.cmake @@ -32,7 +32,7 @@ function(myx_generate_git_info_header TARGET_NAME BASE_FILENAME) cmake_parse_arguments(ARG "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) set(__filename "${PROJECT_BINARY_DIR}/include/${BASE_FILENAME}") - write(APPEND ${__filename} "") + file(APPEND ${__filename} "") set(__prefix "") if(ARG_PREFIX) diff --git a/README.md b/README.md index 1a78d2b..c6f28aa 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ ## Установка В корневом каталоге проекта создать каталог `cmake` и распаковать в него -[архив](../../../releases/download/2.0.21/myx-cmake-local-2.0.21.tar.xz ). +[архив](../../../releases/download/2.0.22/myx-cmake-local-2.0.22.tar.xz ). ## Использование diff --git a/VERSION b/VERSION index 7d5624f..1b8629f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0.21 +2.0.22 diff --git a/debian/CMakeLists.txt b/debian/CMakeLists.txt index 0365e78..b704c85 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.21 LANGUAGES) +project(myx-cmake VERSION 2.0.22 LANGUAGES) include(GNUInstallDirs) file(WRITE ${CMAKE_SOURCE_DIR}/MyxCMake/MyxCMakeConfigVersion.cmake diff --git a/debian/changelog b/debian/changelog index 9b751a5..0e554f0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -myx-cmake (2.0.21) unstable; urgency=medium +myx-cmake (2.0.22) unstable; urgency=medium * New version. diff --git a/myx_setup.cmake b/myx_setup.cmake index b7c20b8..7d85440 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.21 REQUIRED CONFIG PATHS ${MYX_CMAKE_DIR} NO_DEFAULT_PATH) + find_package(MyxCMake 2.0.22 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.21 REQUIRED) + find_package(MyxCMake 2.0.22 REQUIRED) myx_message_notice("=== MyxCMake directory: ${MyxCMake_CONFIG} ===") else() include(${PROJECT_SOURCE_DIR}/cmake/myx/MyxCMakeConfig.cmake)