From 9bd42491f2e65e5309a512f90fd683e5a0b1331e Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Wed, 5 Oct 2022 11:40:48 +0300 Subject: [PATCH] 1.99.91 --- MyxCMake/MyxCMakeConfigVersion.cmake | 2 +- README.md | 4 ++-- VERSION | 2 +- debian/CMakeLists.txt | 2 +- debian/changelog | 2 +- myx_setup.cmake | 4 ++-- upload_release.sh | 5 +---- 7 files changed, 9 insertions(+), 12 deletions(-) diff --git a/MyxCMake/MyxCMakeConfigVersion.cmake b/MyxCMake/MyxCMakeConfigVersion.cmake index dd8477e..d6babcd 100644 --- a/MyxCMake/MyxCMakeConfigVersion.cmake +++ b/MyxCMake/MyxCMakeConfigVersion.cmake @@ -1,4 +1,4 @@ -set(MYX_CMAKE_PACKAGE_VERSION "1.99.90") +set(MYX_CMAKE_PACKAGE_VERSION "1.99.91") 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 f3474b1..571a00b 100644 --- a/README.md +++ b/README.md @@ -36,10 +36,10 @@ if(MYX_CMAKE_DIR) set(ENV{MYX_CMAKE_DIR} ${MYX_CMAKE_DIR}) endif() if(DEFINED ENV{MYX_CMAKE_DIR}) - find_package(MyxCMake 1.99.90 REQUIRED) + find_package(MyxCMake 1.99.91 REQUIRED) else() if(MYX_CMAKE_USE_SYSTEM) - find_package(MyxCMake 1.99.90 REQUIRED) + find_package(MyxCMake 1.99.91 REQUIRED) else() include(${PROJECT_SOURCE_DIR}/cmake/myx/MyxCMakeConfig.cmake) endif() diff --git a/VERSION b/VERSION index 939b2c6..0215f3f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.99.90 +1.99.91 diff --git a/debian/CMakeLists.txt b/debian/CMakeLists.txt index 8ec1faa..f422586 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 1.99.90 LANGUAGES) +project(myx-cmake VERSION 1.99.91 LANGUAGES) include(GNUInstallDirs) file(WRITE ${CMAKE_SOURCE_DIR}/MyxCMake/MyxCMakeConfigVersion.cmake diff --git a/debian/changelog b/debian/changelog index f2974d2..d8ded5c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -myx-cmake (1.99.90) unstable; urgency=medium +myx-cmake (1.99.91) unstable; urgency=medium * New version. diff --git a/myx_setup.cmake b/myx_setup.cmake index 85079a7..aed64c4 100644 --- a/myx_setup.cmake +++ b/myx_setup.cmake @@ -16,11 +16,11 @@ if(MYX_CMAKE_DIR) set(ENV{MYX_CMAKE_DIR} ${MYX_CMAKE_DIR}) endif() if(DEFINED ENV{MYX_CMAKE_DIR}) - find_package(MyxCMake 1.99.90 REQUIRED CONFIG PATHS $ENV{MYX_CMAKE_DIR} NO_DEFAULT_PATH) + find_package(MyxCMake 1.99.91 REQUIRED CONFIG PATHS $ENV{MYX_CMAKE_DIR} NO_DEFAULT_PATH) myx_message_notice("=== MyxCMake directory: ${MyxCMake_CONFIG} ===") else() if(MYX_CMAKE_USE_SYSTEM) - find_package(MyxCMake 1.99.90 REQUIRED) + find_package(MyxCMake 1.99.91 REQUIRED) myx_message_notice("=== MyxCMake directory: ${MyxCMake_CONFIG} ===") else() include(${PROJECT_SOURCE_DIR}/cmake/myx/MyxCMakeConfig.cmake) diff --git a/upload_release.sh b/upload_release.sh index cffb634..3e4a51b 100755 --- a/upload_release.sh +++ b/upload_release.sh @@ -10,7 +10,4 @@ git tag $V git push --tags git tag -d $V git push --all -tea r c --repo cmake/myx -t $V --tag $V -a "$D/myx-cmake-local-${V}.tar.xz" -tea r c --repo cmake/myx -t $V --tag $V -a "$D/myx-cmake_${V}.dsc" -tea r c --repo cmake/myx -t $V --tag $V -a "$D/myx-cmake_${V}.tar.xz" -tea r c --repo cmake/myx -t $V --tag $V -a "$D/myx-cmake_${V}_all.deb" +tea r c --repo cmake/myx -t $V --tag $V -a "$D"/myx-cmake*${V}*