diff --git a/MyxCMake/MyxCMakeConfigVersion.cmake b/MyxCMake/MyxCMakeConfigVersion.cmake index 63fe11e..cc9240d 100644 --- a/MyxCMake/MyxCMakeConfigVersion.cmake +++ b/MyxCMake/MyxCMakeConfigVersion.cmake @@ -1,4 +1,4 @@ -set(MYX_CMAKE_PACKAGE_VERSION "2.4.22") +set(MYX_CMAKE_PACKAGE_VERSION "2.4.23") if(MYX_CMAKE_PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION) set(PACKAGE_VERSION_COMPATIBLE FALSE) else() diff --git a/MyxCMake/lib/AddInterfaceLibrary.cmake b/MyxCMake/lib/AddInterfaceLibrary.cmake index 25ad78d..f8eedd3 100644 --- a/MyxCMake/lib/AddInterfaceLibrary.cmake +++ b/MyxCMake/lib/AddInterfaceLibrary.cmake @@ -58,16 +58,16 @@ function(myx_add_interface_library TARGET_NAME) if(ARG_LINK_LIBRARIES) target_link_libraries(${TARGET_NAME} INTERFACE ${ARG_LINK_LIBRARIES}) -# if(${CMAKE_VERSION} VERSION_GREATER "3.15.0") -# foreach(__lib ${ARG_LINK_LIBRARIES}) -# if(TARGET ${__lib}) -# install( -# TARGETS ${__lib} -# EXPORT ${TARGET_NAME}Targets -# COMPONENT DEV) -# endif() -# endforeach() -# endif() + if(${CMAKE_VERSION} VERSION_GREATER "3.15.0") + foreach(__lib ${ARG_LINK_LIBRARIES}) + if(TARGET ${__lib}) + install( + TARGETS ${__lib} + EXPORT ${TARGET_NAME}Targets + COMPONENT DEV) + endif() + endforeach() + endif() endif() # Библиотека, состоящая только из заголовочных файлов не требует сборки. diff --git a/README.md b/README.md index 61b3ffd..763e05d 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ ## Установка В корневом каталоге проекта создать каталог `cmake` и распаковать в него -[архив](../../../releases/download/2.4.22/myx-cmake-local-2.4.22.tar.xz ). +[архив](../../../releases/download/2.4.23/myx-cmake-local-2.4.23.tar.xz ). ## Использование diff --git a/VERSION b/VERSION index 76cb51e..88b796b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.4.22 +2.4.23 diff --git a/debian/CMakeLists.txt b/debian/CMakeLists.txt index 90f9f00..99b88bc 100644 --- a/debian/CMakeLists.txt +++ b/debian/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.6 FATAL_ERROR) -project(myx-cmake VERSION 2.4.22 LANGUAGES) +project(myx-cmake VERSION 2.4.23 LANGUAGES) include(GNUInstallDirs) file(WRITE ${CMAKE_SOURCE_DIR}/MyxCMake/MyxCMakeConfigVersion.cmake diff --git a/debian/changelog b/debian/changelog index f1f40f8..146eb6d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -myx-cmake (2.4.22) unstable; urgency=medium +myx-cmake (2.4.23) unstable; urgency=medium * New version. diff --git a/myx_setup.cmake b/myx_setup.cmake index d0aa324..374c4ec 100644 --- a/myx_setup.cmake +++ b/myx_setup.cmake @@ -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.22 REQUIRED CONFIG PATHS ${MYX_CMAKE_DIR} NO_DEFAULT_PATH) + find_package(MyxCMake 2.4.23 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.22 REQUIRED) + find_package(MyxCMake 2.4.23 REQUIRED) myx_message_notice("== MyxCMake directory: ${MyxCMake_CONFIG} ==") else() include(${PROJECT_SOURCE_DIR}/cmake/myx/MyxCMakeConfig.cmake)