From 3c686a445237a65d48a39da80c22588845c7dc4d Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Mon, 8 Apr 2024 23:53:48 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20MyxCMake?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmake/myx/MyxCMakeConfigVersion.cmake | 2 +- cmake/myx/lib/generators/GitInfoHeader.cmake | 2 +- cmake/myx/lib/generators/PrivateConfigHeader.cmake | 2 +- cmake/myx_setup.cmake | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmake/myx/MyxCMakeConfigVersion.cmake b/cmake/myx/MyxCMakeConfigVersion.cmake index 697afba..fe1d450 100644 --- a/cmake/myx/MyxCMakeConfigVersion.cmake +++ b/cmake/myx/MyxCMakeConfigVersion.cmake @@ -1,4 +1,4 @@ -set(MYX_CMAKE_PACKAGE_VERSION "2.4.37") +set(MYX_CMAKE_PACKAGE_VERSION "2.4.38") if(MYX_CMAKE_PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION) set(PACKAGE_VERSION_COMPATIBLE FALSE) else() diff --git a/cmake/myx/lib/generators/GitInfoHeader.cmake b/cmake/myx/lib/generators/GitInfoHeader.cmake index 029d7a4..ee69426 100644 --- a/cmake/myx/lib/generators/GitInfoHeader.cmake +++ b/cmake/myx/lib/generators/GitInfoHeader.cmake @@ -50,11 +50,11 @@ function(myx_generate_git_info_header TARGET_NAME BASE_FILENAME) endif() # cmake-format: on - set_property(TARGET ${TARGET_NAME} APPEND PROPERTY PRIVATE_HEADER_FILES ${filename}) get_target_property(target_type ${TARGET_NAME} TYPE) if(${target_type} STREQUAL "INTERFACE_LIBRARY") target_sources(${TARGET_NAME} INTERFACE $) else() + set_property(TARGET ${TARGET_NAME} APPEND PROPERTY PRIVATE_HEADER_FILES ${filename}) target_sources(${TARGET_NAME} PRIVATE ${filename}) endif() add_dependencies(${TARGET_NAME} ${TARGET_NAME}-git-info-header) diff --git a/cmake/myx/lib/generators/PrivateConfigHeader.cmake b/cmake/myx/lib/generators/PrivateConfigHeader.cmake index 528dd34..5323c26 100644 --- a/cmake/myx/lib/generators/PrivateConfigHeader.cmake +++ b/cmake/myx/lib/generators/PrivateConfigHeader.cmake @@ -30,11 +30,11 @@ function(myx_generate_private_config_header TARGET_NAME BASE_FILENAME) set(filename "${PROJECT_BINARY_DIR}/include/${BASE_FILENAME}") configure_file("${CMAKE_CURRENT_FUNCTION_LIST_DIR}/PrivateConfig.hpp.in" ${filename}) - set_property(TARGET ${TARGET_NAME} APPEND PROPERTY PRIVATE_HEADER_FILES ${filename}) get_target_property(target_type ${TARGET_NAME} TYPE) if(${target_type} STREQUAL "INTERFACE_LIBRARY") target_sources(${TARGET_NAME} INTERFACE $) else() + set_property(TARGET ${TARGET_NAME} APPEND PROPERTY PRIVATE_HEADER_FILES ${filename}) target_sources(${TARGET_NAME} PRIVATE ${filename}) endif() endfunction() diff --git a/cmake/myx_setup.cmake b/cmake/myx_setup.cmake index fd79b4b..4dacd27 100644 --- a/cmake/myx_setup.cmake +++ b/cmake/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.37 REQUIRED CONFIG PATHS ${MYX_CMAKE_DIR} NO_DEFAULT_PATH) + find_package(MyxCMake 2.4.38 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.37 REQUIRED) + find_package(MyxCMake 2.4.38 REQUIRED) myx_message_notice("== MyxCMake directory: ${MyxCMake_CONFIG} ==") else() include(${PROJECT_SOURCE_DIR}/cmake/myx/MyxCMakeConfig.cmake)