From 87cf523cd3d41f65557ec25ae8f8e9aff67b618f Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Mon, 8 Apr 2024 22:49:13 +0300 Subject: [PATCH] 2.4.38 --- MyxCMake/MyxCMakeConfigVersion.cmake | 2 +- MyxCMake/lib/generators/GitInfoHeader.cmake | 2 +- MyxCMake/lib/generators/PrivateConfigHeader.cmake | 2 +- README.md | 2 +- VERSION | 2 +- debian/CMakeLists.txt | 2 +- debian/changelog | 2 +- myx_setup.cmake | 4 ++-- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/MyxCMake/MyxCMakeConfigVersion.cmake b/MyxCMake/MyxCMakeConfigVersion.cmake index 697afba..fe1d450 100644 --- a/MyxCMake/MyxCMakeConfigVersion.cmake +++ b/MyxCMake/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/MyxCMake/lib/generators/GitInfoHeader.cmake b/MyxCMake/lib/generators/GitInfoHeader.cmake index 029d7a4..ee69426 100644 --- a/MyxCMake/lib/generators/GitInfoHeader.cmake +++ b/MyxCMake/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/MyxCMake/lib/generators/PrivateConfigHeader.cmake b/MyxCMake/lib/generators/PrivateConfigHeader.cmake index 528dd34..5323c26 100644 --- a/MyxCMake/lib/generators/PrivateConfigHeader.cmake +++ b/MyxCMake/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/README.md b/README.md index a53b3af..757730b 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ ## Установка В корневом каталоге проекта создать каталог `cmake` и распаковать в него -[архив](../../../releases/download/2.4.37/myx-cmake-local-2.4.37.tar.xz ). +[архив](../../../releases/download/2.4.38/myx-cmake-local-2.4.38.tar.xz ). ## Использование diff --git a/VERSION b/VERSION index e9e3014..15efe50 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.4.37 +2.4.38 diff --git a/debian/CMakeLists.txt b/debian/CMakeLists.txt index 9ae5999..9d20843 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.37 LANGUAGES) +project(myx-cmake VERSION 2.4.38 LANGUAGES) include(GNUInstallDirs) file(WRITE ${CMAKE_SOURCE_DIR}/MyxCMake/MyxCMakeConfigVersion.cmake diff --git a/debian/changelog b/debian/changelog index a4ad12e..1eccd76 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -myx-cmake (2.4.37) unstable; urgency=medium +myx-cmake (2.4.38) unstable; urgency=medium * New version. diff --git a/myx_setup.cmake b/myx_setup.cmake index fd79b4b..4dacd27 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.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)