From 87918d40b3739992c87e4174fd08b6e29ca6f6a6 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Thu, 6 Oct 2022 23:51:33 +0300 Subject: [PATCH] 2.0.3 --- MyxxCMake/MyxxCMakeConfig.cmake | 10 ++++++++-- MyxxCMake/MyxxCMakeConfigVersion.cmake | 2 +- VERSION | 2 +- debian/CMakeLists.txt | 2 +- debian/changelog | 2 +- 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/MyxxCMake/MyxxCMakeConfig.cmake b/MyxxCMake/MyxxCMakeConfig.cmake index 1dc4332..92f450e 100644 --- a/MyxxCMake/MyxxCMakeConfig.cmake +++ b/MyxxCMake/MyxxCMakeConfig.cmake @@ -30,9 +30,15 @@ include(${MYXX_CMAKE_LIB_DIR}/pvs-studio/PVS-Studio.cmake) include(${MYXX_CMAKE_LIB_DIR}/AnalyzePvsStudio.cmake) function(myxx) - get_property(targets DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} PROPERTY BUILDSYSTEM_TARGETS) - foreach(iter ${targets}) + # Свойство BUILDSYSTEM_TARGETS доступно в CMake только с версии 3.7 + # Более старые конфигурации придётся настраивать вручную + if(${CMAKE_VERSION} VERSION_LESS "3.7.0") + myx_message_warning("MyxxCMake: automated setup is only available for CMake 3.7+") + return() + endif() + get_property(targets DIRECTORY ${CMAKE_BINARY_DIR} PROPERTY BUILDSYSTEM_TARGETS) + foreach(iter ${targets}) get_target_property(target_type ${iter} TYPE) if(NOT ${target_type} STREQUAL "UTILITY") myxx_code_coverage(${iter}) diff --git a/MyxxCMake/MyxxCMakeConfigVersion.cmake b/MyxxCMake/MyxxCMakeConfigVersion.cmake index 313e412..5e5e3ce 100644 --- a/MyxxCMake/MyxxCMakeConfigVersion.cmake +++ b/MyxxCMake/MyxxCMakeConfigVersion.cmake @@ -1,4 +1,4 @@ -set(MYXX_CMAKE_PACKAGE_VERSION "2.0.2") +set(MYXX_CMAKE_PACKAGE_VERSION "2.0.3") if(MYXX_CMAKE_PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION) set(PACKAGE_VERSION_COMPATIBLE FALSE) else() diff --git a/VERSION b/VERSION index e9307ca..50ffc5a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0.2 +2.0.3 diff --git a/debian/CMakeLists.txt b/debian/CMakeLists.txt index 90d72ff..50776dc 100644 --- a/debian/CMakeLists.txt +++ b/debian/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.6 FATAL_ERROR) -project(myxx-cmake VERSION 2.0.2 LANGUAGES) +project(myxx-cmake VERSION 2.0.3 LANGUAGES) include(GNUInstallDirs) file(WRITE ${CMAKE_SOURCE_DIR}/MyxxCMake/MyxxCMakeConfigVersion.cmake diff --git a/debian/changelog b/debian/changelog index 9970128..5898dbd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -myxx-cmake (2.0.2) unstable; urgency=medium +myxx-cmake (2.0.3) unstable; urgency=medium * New version.