2.4.6
This commit is contained in:
parent
817f95f758
commit
969667e9b1
@ -1,4 +1,4 @@
|
||||
set(MYX_CMAKE_PACKAGE_VERSION "2.4.3")
|
||||
set(MYX_CMAKE_PACKAGE_VERSION "2.4.6")
|
||||
if(MYX_CMAKE_PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
|
||||
set(PACKAGE_VERSION_COMPATIBLE FALSE)
|
||||
else()
|
||||
|
@ -21,7 +21,7 @@ myx_download_content
|
||||
|
||||
find_package(Git QUIET)
|
||||
|
||||
option(ENABLE_DONWLOAD_CONTENT "Enable download content" ON)
|
||||
option(ENABLE_DOWNLOAD_CONTENT "Enable download content" ON)
|
||||
|
||||
function(myx_download_content NAME)
|
||||
set(options)
|
||||
@ -41,7 +41,7 @@ function(myx_download_content NAME)
|
||||
endif()
|
||||
|
||||
if(NOT ARG_DOWNLOAD_DIR)
|
||||
set(ARG_DOWNLOAD_DIR downloads)
|
||||
set(ARG_DOWNLOAD_DIR "_downloads")
|
||||
endif()
|
||||
|
||||
if(CMAKE_SCRIPT_MODE_FILE)
|
||||
|
@ -3,7 +3,7 @@
|
||||
## Установка
|
||||
|
||||
В корневом каталоге проекта создать каталог `cmake` и распаковать в него
|
||||
[архив](../../../releases/download/2.4.3/myx-cmake-local-2.4.3.tar.xz ).
|
||||
[архив](../../../releases/download/2.4.6/myx-cmake-local-2.4.6.tar.xz ).
|
||||
|
||||
## Использование
|
||||
|
||||
|
2
debian/CMakeLists.txt
vendored
2
debian/CMakeLists.txt
vendored
@ -1,5 +1,5 @@
|
||||
cmake_minimum_required(VERSION 3.6 FATAL_ERROR)
|
||||
project(myx-cmake VERSION 2.4.3 LANGUAGES)
|
||||
project(myx-cmake VERSION 2.4.6 LANGUAGES)
|
||||
|
||||
include(GNUInstallDirs)
|
||||
file(WRITE ${CMAKE_SOURCE_DIR}/MyxCMake/MyxCMakeConfigVersion.cmake
|
||||
|
2
debian/changelog
vendored
2
debian/changelog
vendored
@ -1,4 +1,4 @@
|
||||
myx-cmake (2.4.3) unstable; urgency=medium
|
||||
myx-cmake (2.4.6) unstable; urgency=medium
|
||||
|
||||
* New version.
|
||||
|
||||
|
@ -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.3 REQUIRED CONFIG PATHS ${MYX_CMAKE_DIR} NO_DEFAULT_PATH)
|
||||
find_package(MyxCMake 2.4.6 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.3 REQUIRED)
|
||||
find_package(MyxCMake 2.4.6 REQUIRED)
|
||||
myx_message_notice("== MyxCMake directory: ${MyxCMake_CONFIG} ==")
|
||||
else()
|
||||
include(${PROJECT_SOURCE_DIR}/cmake/myx/MyxCMakeConfig.cmake)
|
||||
|
Loading…
Reference in New Issue
Block a user