From b70f88f259517d62b96e760b1ab598c225d4af49 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Thu, 6 Oct 2022 16:28:15 +0300 Subject: [PATCH] 2.0.1 --- MyxCMake/MyxCMakeConfigVersion.cmake | 2 +- README.md | 2 +- VERSION | 2 +- debian/CMakeLists.txt | 2 +- debian/changelog | 2 +- myx_setup.cmake | 19 +++++++++++++------ 6 files changed, 18 insertions(+), 11 deletions(-) diff --git a/MyxCMake/MyxCMakeConfigVersion.cmake b/MyxCMake/MyxCMakeConfigVersion.cmake index 670e725..fd008ec 100644 --- a/MyxCMake/MyxCMakeConfigVersion.cmake +++ b/MyxCMake/MyxCMakeConfigVersion.cmake @@ -1,4 +1,4 @@ -set(MYX_CMAKE_PACKAGE_VERSION "2.0.0") +set(MYX_CMAKE_PACKAGE_VERSION "2.0.1") if(MYX_CMAKE_PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION) set(PACKAGE_VERSION_COMPATIBLE FALSE) else() diff --git a/README.md b/README.md index 5123cb8..e31ee1a 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ ## Установка В корневом каталоге проекта создать каталог `cmake` и распаковать в него -[архив](../../../releases/download/2.0.0/myx-cmake-local-2.0.0.tar.xz ). +[архив](../../../releases/download/2.0.1/myx-cmake-local-2.0.1.tar.xz ). ## Использование diff --git a/VERSION b/VERSION index 227cea2..38f77a6 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0.0 +2.0.1 diff --git a/debian/CMakeLists.txt b/debian/CMakeLists.txt index 8c8fa7f..c05a718 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.0 LANGUAGES) +project(myx-cmake VERSION 2.0.1 LANGUAGES) include(GNUInstallDirs) file(WRITE ${CMAKE_SOURCE_DIR}/MyxCMake/MyxCMakeConfigVersion.cmake diff --git a/debian/changelog b/debian/changelog index 6837552..0f18366 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -myx-cmake (2.0.0) unstable; urgency=medium +myx-cmake (2.0.1) unstable; urgency=medium * New version. diff --git a/myx_setup.cmake b/myx_setup.cmake index a0956d5..d1f0e7a 100644 --- a/myx_setup.cmake +++ b/myx_setup.cmake @@ -16,15 +16,15 @@ проекта использовать дополнительные инструменты для его сопровождения. #]=======================================================================] -if(MYX_CMAKE_DIR) - set(ENV{MYX_CMAKE_DIR} ${MYX_CMAKE_DIR}) +if(ENV{MYX_CMAKE_DIR}) + set(MYX_CMAKE_DIR $ENV{MYX_CMAKE_DIR}) endif() -if(DEFINED ENV{MYX_CMAKE_DIR}) - find_package(MyxCMake 2.0.0 REQUIRED CONFIG PATHS $ENV{MYX_CMAKE_DIR} NO_DEFAULT_PATH) +if(MYX_CMAKE_DIR) + find_package(MyxCMake 2.0.1 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.0 REQUIRED) + find_package(MyxCMake 2.0.1 REQUIRED) myx_message_notice("=== MyxCMake directory: ${MyxCMake_CONFIG} ===") else() include(${PROJECT_SOURCE_DIR}/cmake/myx/MyxCMakeConfig.cmake) @@ -32,5 +32,12 @@ else() endif() endif() -find_package(MyxxCMake CONFIG PATHS "$ENV{XDG_DATA_DIR}/cmake" QUIET) +if(ENV{MYXX_CMAKE_DIR}) + set(MYXX_CMAKE_DIR $ENV{MYXX_CMAKE_DIR}) +endif() +if(MYXX_CMAKE_DIR) + find_package(MyxxCMake CONFIG PATHS ${MYXX_CMAKE_DIR} NO_DEFAULT_PATH) +else() + find_package(MyxxCMake CONFIG PATHS "$ENV{XDG_DATA_DIR}/cmake" QUIET) +endif()