diff --git a/Makefile b/Makefile index 30bab50..1b98e3c 100644 --- a/Makefile +++ b/Makefile @@ -47,7 +47,7 @@ upload: -a $(BUILD_DIR)/myx-cmake_$(V).dsc \ -a $(BUILD_DIR)/myx-cmake_$(V).tar.xz \ -a $(BUILD_DIR)/myx-cmake_$(V)_all.deb \ - -a $(BUILD_DIR)/myx-cmake-local-$(V).tar.xz + -a $(BUILD_DIR)/myx-cmake-local-$(V).tar.xz \ -a $(BUILD_DIR)/myx-cmake-unity-$(V).tar.xz git tag -d $(V) git push diff --git a/MyxCMake/MyxCMakeConfigVersion.cmake b/MyxCMake/MyxCMakeConfigVersion.cmake index e6e5d65..746b7d4 100644 --- a/MyxCMake/MyxCMakeConfigVersion.cmake +++ b/MyxCMake/MyxCMakeConfigVersion.cmake @@ -1,4 +1,4 @@ -set(MYX_CMAKE_PACKAGE_VERSION "2.4.15") +set(MYX_CMAKE_PACKAGE_VERSION "2.4.16") 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 20f9ae9..d0844d2 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ ## Установка В корневом каталоге проекта создать каталог `cmake` и распаковать в него -[архив](../../../releases/download/2.4.15/myx-cmake-local-2.4.15.tar.xz ). +[архив](../../../releases/download/2.4.16/myx-cmake-local-2.4.16.tar.xz ). ## Использование diff --git a/VERSION b/VERSION index 84cc65e..4863400 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.4.15 +2.4.16 diff --git a/debian/CMakeLists.txt b/debian/CMakeLists.txt index 6edc910..8901d07 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.15 LANGUAGES) +project(myx-cmake VERSION 2.4.16 LANGUAGES) include(GNUInstallDirs) file(WRITE ${CMAKE_SOURCE_DIR}/MyxCMake/MyxCMakeConfigVersion.cmake diff --git a/debian/changelog b/debian/changelog index 82d19ba..9b4820b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -myx-cmake (2.4.15) unstable; urgency=medium +myx-cmake (2.4.16) unstable; urgency=medium * New version. diff --git a/myx_setup.cmake b/myx_setup.cmake index a2b0831..8fd15d3 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.15 REQUIRED CONFIG PATHS ${MYX_CMAKE_DIR} NO_DEFAULT_PATH) + find_package(MyxCMake 2.4.16 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.15 REQUIRED) + find_package(MyxCMake 2.4.16 REQUIRED) myx_message_notice("== MyxCMake directory: ${MyxCMake_CONFIG} ==") else() include(${PROJECT_SOURCE_DIR}/cmake/myx/MyxCMakeConfig.cmake)