This commit is contained in:
Andrei Astafev 2022-10-06 11:34:47 +03:00
parent 038e650809
commit bd8ed5e679
7 changed files with 10 additions and 10 deletions

View File

@ -7,7 +7,8 @@ PACK_DIR:=$(BUILD_DIR)/pack/myx-cmake-$(V)
all: update_version deb pack
update_version:
sed -i "s/VERSION/$V/" $(TOP_DIR)/README.md
sed -i "s/\/[0-9][0-9.]\+/\/$V/g" $(TOP_DIR)/README.md
sed -i "s/[0-9][0-9.]\+tar/$V.tar/g" $(TOP_DIR)/README.md
sed -i "s/CMake.*REQUIRED/CMake $V REQUIRED/" $(TOP_DIR)/README.md $(TOP_DIR)/myx_setup.cmake
sed -i "s/VERSION \".*\"/VERSION \"$V\"/" $(TOP_DIR)/MyxCMake/MyxCMakeConfigVersion.cmake
sed -i "s/VERSION .* LANG/VERSION $V LANG/" $(TOP_DIR)/debian/CMakeLists.txt

View File

@ -1,4 +1,4 @@
set(MYX_CMAKE_PACKAGE_VERSION "1.99.97")
set(MYX_CMAKE_PACKAGE_VERSION "1.99.98")
if(MYX_CMAKE_PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
set(PACKAGE_VERSION_COMPATIBLE FALSE)
else()

View File

@ -2,9 +2,8 @@
## Установка
В корневом каталоге проекта создать каталог `cmake` и
распаковать в него архив myx-cmake-local-1.99.97.tar.xz,
который можно скачать [здесь](../../../releases).
В корневом каталоге проекта создать каталог `cmake` и распаковать в него
[архив](../../../releases/download/1.99.98/myx-cmake-local-1.99.98.tar.xz ).
## Использование

View File

@ -1 +1 @@
1.99.97
1.99.98

View File

@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.6 FATAL_ERROR)
project(myx-cmake VERSION 1.99.97 LANGUAGES)
project(myx-cmake VERSION 1.99.98 LANGUAGES)
include(GNUInstallDirs)
file(WRITE ${CMAKE_SOURCE_DIR}/MyxCMake/MyxCMakeConfigVersion.cmake

2
debian/changelog vendored
View File

@ -1,4 +1,4 @@
myx-cmake (1.99.97) unstable; urgency=medium
myx-cmake (1.99.98) unstable; urgency=medium
* New version.

View File

@ -20,11 +20,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.97 REQUIRED CONFIG PATHS $ENV{MYX_CMAKE_DIR} NO_DEFAULT_PATH)
find_package(MyxCMake 1.99.98 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.97 REQUIRED)
find_package(MyxCMake 1.99.98 REQUIRED)
myx_message_notice("=== MyxCMake directory: ${MyxCMake_CONFIG} ===")
else()
include(${PROJECT_SOURCE_DIR}/cmake/myx/MyxCMakeConfig.cmake)