This commit is contained in:
Andrei Astafev 2022-10-08 22:31:13 +03:00
parent 7bb178b24d
commit cbb4c4cfb6
7 changed files with 8 additions and 8 deletions

View File

@ -1,4 +1,4 @@
set(MYX_CMAKE_PACKAGE_VERSION "2.0.10") set(MYX_CMAKE_PACKAGE_VERSION "2.0.11")
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()

View File

@ -5,7 +5,7 @@ macro(myx_skip_external_target NAME)
get_target_property(__type ${NAME} TYPE) get_target_property(__type ${NAME} TYPE)
if(__type STREQUAL "INTERFACE_LIBRARY") if(__type STREQUAL "INTERFACE_LIBRARY")
get_target_property(__sources ${NAME} INTERFACE_SOURCES) get_target_property(__sources ${NAME} INTERFACE_SOURCES)
foreach(iter ${_sources}) foreach(iter ${__sources})
string(FIND ${iter} ${CMAKE_BINARY_DIR} __pos) string(FIND ${iter} ${CMAKE_BINARY_DIR} __pos)
if(__pos EQUAL 0) if(__pos EQUAL 0)
unset(__type) unset(__type)

View File

@ -3,7 +3,7 @@
## Установка ## Установка
В корневом каталоге проекта создать каталог `cmake` и распаковать в него В корневом каталоге проекта создать каталог `cmake` и распаковать в него
[архив](../../../releases/download/2.0.10/myx-cmake-local-2.0.10.tar.xz ). [архив](../../../releases/download/2.0.11/myx-cmake-local-2.0.11.tar.xz ).
## Использование ## Использование

View File

@ -1 +1 @@
2.0.10 2.0.11

View File

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

2
debian/changelog vendored
View File

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

View File

@ -20,11 +20,11 @@ if(ENV{MYX_CMAKE_DIR})
set(MYX_CMAKE_DIR $ENV{MYX_CMAKE_DIR}) set(MYX_CMAKE_DIR $ENV{MYX_CMAKE_DIR})
endif() endif()
if(MYX_CMAKE_DIR) if(MYX_CMAKE_DIR)
find_package(MyxCMake 2.0.10 REQUIRED CONFIG PATHS ${MYX_CMAKE_DIR} NO_DEFAULT_PATH) find_package(MyxCMake 2.0.11 REQUIRED CONFIG PATHS ${MYX_CMAKE_DIR} NO_DEFAULT_PATH)
myx_message_notice("=== MyxCMake directory: ${MyxCMake_CONFIG} ===") myx_message_notice("=== MyxCMake directory: ${MyxCMake_CONFIG} ===")
else() else()
if(MYX_CMAKE_USE_SYSTEM) if(MYX_CMAKE_USE_SYSTEM)
find_package(MyxCMake 2.0.10 REQUIRED) find_package(MyxCMake 2.0.11 REQUIRED)
myx_message_notice("=== MyxCMake directory: ${MyxCMake_CONFIG} ===") myx_message_notice("=== MyxCMake directory: ${MyxCMake_CONFIG} ===")
else() else()
include(${PROJECT_SOURCE_DIR}/cmake/myx/MyxCMakeConfig.cmake) include(${PROJECT_SOURCE_DIR}/cmake/myx/MyxCMakeConfig.cmake)