This commit is contained in:
Andrei Astafev 2022-10-04 19:30:08 +03:00
parent 5008ead41f
commit f7500d2bda
5 changed files with 18 additions and 5 deletions

View File

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

View File

@ -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.78 REQUIRED)
find_package(MyxCMake 1.99.80 REQUIRED)
else()
if(MYX_CMAKE_USE_SYSTEM)
find_package(MyxCMake 1.99.78 REQUIRED)
find_package(MyxCMake 1.99.80 REQUIRED)
else()
include(${PROJECT_SOURCE_DIR}/cmake/myx/MyxCMakeConfig.cmake)
endif()

View File

@ -1 +1 @@
1.99.78
1.99.80

View File

@ -32,7 +32,7 @@ function(myx_target_setup NAME)
${CMAKE_BINARY_DIR}/share
# Ссылка на каталог настроек
COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_SOURCE_DIR}/files/etc
${CMAKE_BINARY_DIR}/etc)
${CMAKE_BINARY_DIR}/etc
)
add_dependencies(${NAME} ${NAME}-populate-cmake-binary-dir)
endif()

13
upload_release.sh Executable file
View File

@ -0,0 +1,13 @@
#!/bin/bash
set -e
V=$(cat VERSION)
D=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 build/myx-cmake-$V.tar.xz