diff --git a/MyxCMake/MyxCMakeConfigVersion.cmake b/MyxCMake/MyxCMakeConfigVersion.cmake index ee09e14..1cab49b 100644 --- a/MyxCMake/MyxCMakeConfigVersion.cmake +++ b/MyxCMake/MyxCMakeConfigVersion.cmake @@ -1,4 +1,4 @@ -set(MYX_CMAKE_PACKAGE_VERSION "2.4.26") +set(MYX_CMAKE_PACKAGE_VERSION "2.4.28") 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 b7a58ed..a867446 100644 --- a/MyxCMake/lib/AddInterfaceLibrary.cmake +++ b/MyxCMake/lib/AddInterfaceLibrary.cmake @@ -69,11 +69,12 @@ function(myx_add_interface_library TARGET_NAME) set(__exlib "${__lib}_shared") endif() endif() + else() + install(TARGETS ${__lib} + EXPORT ${TARGET_NAME}Targets + COMPONENT DEV) endif() target_link_libraries(${TARGET_NAME} INTERFACE ${__exlib}) - # install(TARGETS ${__exlib} - # EXPORT ${TARGET_NAME}Targets - # COMPONENT DEV) endif() endforeach() endif() diff --git a/README.md b/README.md index bf542f4..0f9c199 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ ## Установка В корневом каталоге проекта создать каталог `cmake` и распаковать в него -[архив](../../../releases/download/2.4.26/myx-cmake-local-2.4.26.tar.xz ). +[архив](../../../releases/download/2.4.28/myx-cmake-local-2.4.28.tar.xz ). ## Использование diff --git a/VERSION b/VERSION index 11a0d85..cd1f26c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.4.26 +2.4.28 diff --git a/debian/CMakeLists.txt b/debian/CMakeLists.txt index fe56784..b4ad386 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.26 LANGUAGES) +project(myx-cmake VERSION 2.4.28 LANGUAGES) include(GNUInstallDirs) file(WRITE ${CMAKE_SOURCE_DIR}/MyxCMake/MyxCMakeConfigVersion.cmake diff --git a/debian/changelog b/debian/changelog index 9914501..3874abd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -myx-cmake (2.4.26) unstable; urgency=medium +myx-cmake (2.4.28) unstable; urgency=medium * New version. diff --git a/myx_setup.cmake b/myx_setup.cmake index 679c0a8..50dd270 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.26 REQUIRED CONFIG PATHS ${MYX_CMAKE_DIR} NO_DEFAULT_PATH) + find_package(MyxCMake 2.4.28 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.26 REQUIRED) + find_package(MyxCMake 2.4.28 REQUIRED) myx_message_notice("== MyxCMake directory: ${MyxCMake_CONFIG} ==") else() include(${PROJECT_SOURCE_DIR}/cmake/myx/MyxCMakeConfig.cmake)