1.99.64
This commit is contained in:
parent
77ec0326be
commit
e71ec5c925
@ -1,13 +0,0 @@
|
||||
stages:
|
||||
- release
|
||||
|
||||
release_job:
|
||||
stage: release
|
||||
image: registry.gitlab.com/gitlab-org/release-cli:latest
|
||||
rules:
|
||||
- if: $CI_COMMIT_TAG
|
||||
script:
|
||||
- tar acf myx-cmake-${CI_COMMIT_TAG}.tar.xz lib backports *.cmake
|
||||
release:
|
||||
tag_name: '$CI_COMMIT_TAG'
|
||||
description: '$CI_COMMIT_TAG'
|
@ -1,4 +1,4 @@
|
||||
set(MYX_CMAKE_PACKAGE_VERSION "1.99.63")
|
||||
set(MYX_CMAKE_PACKAGE_VERSION "1.99.64")
|
||||
if(MYX_CMAKE_PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
|
||||
set(PACKAGE_VERSION_COMPATIBLE FALSE)
|
||||
else()
|
||||
|
11
README.md
11
README.md
@ -7,8 +7,8 @@
|
||||
|
||||
## Использование
|
||||
|
||||
В основном файле `CMakeLists.txt` проекта после команды
|
||||
`project` добавить строки:
|
||||
В основном файле `CMakeLists.txt` проекта после вызова команды
|
||||
`project()` добавить строки:
|
||||
|
||||
```cmake
|
||||
# Рекомендуемый способ подключения MyxCMake
|
||||
@ -36,15 +36,12 @@ if(MYX_CMAKE_DIR)
|
||||
set(ENV{MYX_CMAKE_DIR} ${MYX_CMAKE_DIR})
|
||||
endif()
|
||||
if(DEFINED ENV{MYX_CMAKE_DIR})
|
||||
find_package(MyxCMake 1.99.63 REQUIRED)
|
||||
myx_message_notice("=== MyxCMake directory: ${MyxCMake_CONFIG} ===")
|
||||
find_package(MyxCMake 1.99.64 REQUIRED)
|
||||
else()
|
||||
if(MYX_CMAKE_USE_SYSTEM)
|
||||
find_package(MyxCMake 1.99.63 REQUIRED)
|
||||
myx_message_notice("=== MyxCMake directory: ${MyxCMake_CONFIG} ===")
|
||||
find_package(MyxCMake 1.99.64 REQUIRED)
|
||||
else()
|
||||
include(${PROJECT_SOURCE_DIR}/cmake/myx/MyxCMakeConfig.cmake)
|
||||
myx_message_notice("=== MyxCMake directory: ${PROJECT_SOURCE_DIR}/cmake/myx ===")
|
||||
endif()
|
||||
endif()
|
||||
```
|
||||
|
@ -28,4 +28,6 @@ tar acf "$D/myx-cmake-$V.tar.xz" lib backports *.cmake
|
||||
git commit -a
|
||||
git tag $V
|
||||
git push --tags
|
||||
git tag -d $V
|
||||
git push --all
|
||||
tea r c -t $V --tag $V -a build/myx-cmake-$V.tar.xz
|
||||
|
Loading…
Reference in New Issue
Block a user