1.99.80
This commit is contained in:
parent
5008ead41f
commit
f7500d2bda
@ -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)
|
if(MYX_CMAKE_PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
|
||||||
set(PACKAGE_VERSION_COMPATIBLE FALSE)
|
set(PACKAGE_VERSION_COMPATIBLE FALSE)
|
||||||
else()
|
else()
|
||||||
|
@ -36,10 +36,10 @@ if(MYX_CMAKE_DIR)
|
|||||||
set(ENV{MYX_CMAKE_DIR} ${MYX_CMAKE_DIR})
|
set(ENV{MYX_CMAKE_DIR} ${MYX_CMAKE_DIR})
|
||||||
endif()
|
endif()
|
||||||
if(DEFINED ENV{MYX_CMAKE_DIR})
|
if(DEFINED ENV{MYX_CMAKE_DIR})
|
||||||
find_package(MyxCMake 1.99.78 REQUIRED)
|
find_package(MyxCMake 1.99.80 REQUIRED)
|
||||||
else()
|
else()
|
||||||
if(MYX_CMAKE_USE_SYSTEM)
|
if(MYX_CMAKE_USE_SYSTEM)
|
||||||
find_package(MyxCMake 1.99.78 REQUIRED)
|
find_package(MyxCMake 1.99.80 REQUIRED)
|
||||||
else()
|
else()
|
||||||
include(${PROJECT_SOURCE_DIR}/cmake/myx/MyxCMakeConfig.cmake)
|
include(${PROJECT_SOURCE_DIR}/cmake/myx/MyxCMakeConfig.cmake)
|
||||||
endif()
|
endif()
|
||||||
|
@ -32,7 +32,7 @@ function(myx_target_setup NAME)
|
|||||||
${CMAKE_BINARY_DIR}/share
|
${CMAKE_BINARY_DIR}/share
|
||||||
# Ссылка на каталог настроек
|
# Ссылка на каталог настроек
|
||||||
COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_SOURCE_DIR}/files/etc
|
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)
|
add_dependencies(${NAME} ${NAME}-populate-cmake-binary-dir)
|
||||||
endif()
|
endif()
|
||||||
|
13
upload_release.sh
Executable file
13
upload_release.sh
Executable 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
|
Loading…
x
Reference in New Issue
Block a user