From 38b8da8bf57ae2fc11d2d170cd65e52d2bcf2c0a Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Wed, 5 Oct 2022 14:57:56 +0300 Subject: [PATCH] 1.99.93 --- MyxCMake/MyxCMakeConfig.cmake | 1 + MyxCMake/MyxCMakeConfigVersion.cmake | 2 +- MyxCMake/lib/AddExecutable.cmake | 22 ++++++++++++++++++++++ README.md | 4 ++-- VERSION | 2 +- debian/CMakeLists.txt | 2 +- debian/changelog | 2 +- myx_setup.cmake | 4 ++-- upload_release.sh | 5 ++--- 9 files changed, 33 insertions(+), 11 deletions(-) create mode 100644 MyxCMake/lib/AddExecutable.cmake diff --git a/MyxCMake/MyxCMakeConfig.cmake b/MyxCMake/MyxCMakeConfig.cmake index 9b02894..8e541bb 100644 --- a/MyxCMake/MyxCMakeConfig.cmake +++ b/MyxCMake/MyxCMakeConfig.cmake @@ -33,6 +33,7 @@ include(${MYX_CMAKE_LIB_DIR}/SemanticProjectVersion.cmake) include(${MYX_CMAKE_LIB_DIR}/NinjaGeneratorWrapper.cmake) include(${MYX_CMAKE_LIB_DIR}/FetchContentAdd.cmake) +include(${MYX_CMAKE_LIB_DIR}/AddExecutable.cmake) include(${MYX_CMAKE_LIB_DIR}/AddLibrary.cmake) include(${MYX_CMAKE_LIB_DIR}/TargetSetup.cmake) include(${MYX_CMAKE_LIB_DIR}/Qt5TargetSetup.cmake) diff --git a/MyxCMake/MyxCMakeConfigVersion.cmake b/MyxCMake/MyxCMakeConfigVersion.cmake index c200187..403a095 100644 --- a/MyxCMake/MyxCMakeConfigVersion.cmake +++ b/MyxCMake/MyxCMakeConfigVersion.cmake @@ -1,4 +1,4 @@ -set(MYX_CMAKE_PACKAGE_VERSION "1.99.92") +set(MYX_CMAKE_PACKAGE_VERSION "1.99.93") if(MYX_CMAKE_PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION) set(PACKAGE_VERSION_COMPATIBLE FALSE) else() diff --git a/MyxCMake/lib/AddExecutable.cmake b/MyxCMake/lib/AddExecutable.cmake new file mode 100644 index 0000000..0894dce --- /dev/null +++ b/MyxCMake/lib/AddExecutable.cmake @@ -0,0 +1,22 @@ +#[=======================================================================[.rst: +myx_add_executable +------------------ + +Вспомогательная функция для создания исполняемого файла:: + + myx_add_executable(NAME) + +Используется для совместимости с версиями CMake раньше 3.11, +в которых было необходимо указать хотя бы один файл с исходными текстами. + +#]=======================================================================] + +include_guard(GLOBAL) + +function(myx_add_executable NAME) + if(${CMAKE_VERSION} VERSION_LESS "3.11.0") + add_executable(${NAME} ${ARGN} "") + else() + add_executable(${NAME} ${ARGN}) + endif() +endfunction() diff --git a/README.md b/README.md index 9fc0282..72015b5 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.92 REQUIRED) + find_package(MyxCMake 1.99.93 REQUIRED) else() if(MYX_CMAKE_USE_SYSTEM) - find_package(MyxCMake 1.99.92 REQUIRED) + find_package(MyxCMake 1.99.93 REQUIRED) else() include(${PROJECT_SOURCE_DIR}/cmake/myx/MyxCMakeConfig.cmake) endif() diff --git a/VERSION b/VERSION index 780705f..d39a50d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.99.92 +1.99.93 diff --git a/debian/CMakeLists.txt b/debian/CMakeLists.txt index fd8c63f..0dfe83b 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.92 LANGUAGES) +project(myx-cmake VERSION 1.99.93 LANGUAGES) include(GNUInstallDirs) file(WRITE ${CMAKE_SOURCE_DIR}/MyxCMake/MyxCMakeConfigVersion.cmake diff --git a/debian/changelog b/debian/changelog index 0e1cab7..f511f20 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -myx-cmake (1.99.92) unstable; urgency=medium +myx-cmake (1.99.93) unstable; urgency=medium * New version. diff --git a/myx_setup.cmake b/myx_setup.cmake index db0ba56..06d1aae 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.92 REQUIRED CONFIG PATHS $ENV{MYX_CMAKE_DIR} NO_DEFAULT_PATH) + find_package(MyxCMake 1.99.93 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.92 REQUIRED) + find_package(MyxCMake 1.99.93 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 a209355..97fdf8a 100755 --- a/upload_release.sh +++ b/upload_release.sh @@ -7,12 +7,11 @@ D="$(pwd)/build" git commit -a 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_${V}.dsc \ -a "$D"/myx-cmake_${V}.tar.xz \ -a "$D"/myx-cmake_${V}_all.deb \ -a "$D"/myx-cmake-local-${V}.tar.xz - +git tag -d $V +git pushall