diff --git a/MyxCMake/MyxCMakeConfigVersion.cmake b/MyxCMake/MyxCMakeConfigVersion.cmake index b8dff12..c3f4d94 100644 --- a/MyxCMake/MyxCMakeConfigVersion.cmake +++ b/MyxCMake/MyxCMakeConfigVersion.cmake @@ -1,4 +1,4 @@ -set(MYX_CMAKE_PACKAGE_VERSION "2.4.30") +set(MYX_CMAKE_PACKAGE_VERSION "2.4.31") 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 9e87569..a5298ea 100644 --- a/MyxCMake/lib/AddInterfaceLibrary.cmake +++ b/MyxCMake/lib/AddInterfaceLibrary.cmake @@ -59,6 +59,13 @@ function(myx_add_interface_library TARGET_NAME) foreach(lib ${ARG_LINK_LIBRARIES}) if(TARGET ${lib}) set(exlib ${lib}) + get_target_property(type ${lib} TYPE) + if(type) + get_target_property(include_dirs ${lib} INTERFACE_INCLUDE_DIRECTORIES) + if(include_dirs) + target_include_directories(${TARGET_NAME} INTERFACE ${include_dirs}) + endif() + endif() if(${CMAKE_VERSION} VERSION_GREATER "3.13.0") install(TARGETS ${lib} EXPORT ${TARGET_NAME}Targets diff --git a/MyxCMake/lib/TargetSetup.cmake b/MyxCMake/lib/TargetSetup.cmake index 150d4a5..c7dd3e7 100644 --- a/MyxCMake/lib/TargetSetup.cmake +++ b/MyxCMake/lib/TargetSetup.cmake @@ -76,7 +76,6 @@ function(myx_target_setup TARGET_NAME) endif() target_sources(${TARGET_NAME} PRIVATE ${ARG_CPP} ${ARG_PCH} ${ARG_PRIVATE_HEADERS}) - target_sources(${TARGET_NAME} PUBLIC ${ARG_PUBLIC_HEADERS}) target_compile_definitions(${TARGET_NAME} PRIVATE ${ARG_COMPILE_DEFINITIONS}) target_include_directories(${TARGET_NAME} PRIVATE ${ARG_INCLUDE_DIRECTORIES}) diff --git a/README.md b/README.md index 0f91646..49a822d 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ ## Установка В корневом каталоге проекта создать каталог `cmake` и распаковать в него -[архив](../../../releases/download/2.4.30/myx-cmake-local-2.4.30.tar.xz ). +[архив](../../../releases/download/2.4.31/myx-cmake-local-2.4.31.tar.xz ). ## Использование diff --git a/VERSION b/VERSION index 8ea99f5..c9bcb1c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.4.30 +2.4.31 diff --git a/debian/CMakeLists.txt b/debian/CMakeLists.txt index ed91456..e85c91b 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.30 LANGUAGES) +project(myx-cmake VERSION 2.4.31 LANGUAGES) include(GNUInstallDirs) file(WRITE ${CMAKE_SOURCE_DIR}/MyxCMake/MyxCMakeConfigVersion.cmake diff --git a/debian/changelog b/debian/changelog index 58a7dd8..7d844ba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -myx-cmake (2.4.30) unstable; urgency=medium +myx-cmake (2.4.31) unstable; urgency=medium * New version. diff --git a/myx_setup.cmake b/myx_setup.cmake index 15f50fd..dfabe5f 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.30 REQUIRED CONFIG PATHS ${MYX_CMAKE_DIR} NO_DEFAULT_PATH) + find_package(MyxCMake 2.4.31 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.30 REQUIRED) + find_package(MyxCMake 2.4.31 REQUIRED) myx_message_notice("== MyxCMake directory: ${MyxCMake_CONFIG} ==") else() include(${PROJECT_SOURCE_DIR}/cmake/myx/MyxCMakeConfig.cmake)