From 14ee051dcb1922aa5ba960cc793d58265e32e266 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Wed, 10 Apr 2024 23:22:41 +0300 Subject: [PATCH] 2.4.42 --- MyxCMake/MyxCMakeConfigVersion.cmake | 2 +- MyxCMake/lib/macro/FindQt.cmake | 4 ++-- README.md | 2 +- VERSION | 2 +- debian/CMakeLists.txt | 2 +- debian/changelog | 2 +- myx_setup.cmake | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/MyxCMake/MyxCMakeConfigVersion.cmake b/MyxCMake/MyxCMakeConfigVersion.cmake index 55c1a08..a3e5685 100644 --- a/MyxCMake/MyxCMakeConfigVersion.cmake +++ b/MyxCMake/MyxCMakeConfigVersion.cmake @@ -1,4 +1,4 @@ -set(MYX_CMAKE_PACKAGE_VERSION "2.4.41") +set(MYX_CMAKE_PACKAGE_VERSION "2.4.42") if(MYX_CMAKE_PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION) set(PACKAGE_VERSION_COMPATIBLE FALSE) else() diff --git a/MyxCMake/lib/macro/FindQt.cmake b/MyxCMake/lib/macro/FindQt.cmake index 901c4eb..97d3cb1 100644 --- a/MyxCMake/lib/macro/FindQt.cmake +++ b/MyxCMake/lib/macro/FindQt.cmake @@ -22,14 +22,14 @@ macro(myx_find_qt) message(FATAL_ERROR "Supported Qt versions are 5 and 6") endif() - if(ARG_REQUIRED) + if(ARG_REQUIRED AND ARG_PRIVATE) message("-- MyxCMake: searching required Qt private components: ${ARG_PRIVATE}") endif() foreach(iter ${ARG_PRIVATE}) find_package("Qt${ARG_VERSION}${iter}" COMPONENTS Private ${ARG_REQUIRED}) endforeach() - if(ARG_REQUIRED) + if(ARG_REQUIRED AND ARG_COMPONENTS) message("-- MyxCMake: searching required Qt components: ${ARG_COMPONENTS}") endif() foreach(iter ${ARG_COMPONENTS}) diff --git a/README.md b/README.md index 211a30f..217197c 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ ## Установка В корневом каталоге проекта создать каталог `cmake` и распаковать в него -[архив](../../../releases/download/2.4.41/myx-cmake-local-2.4.41.tar.xz ). +[архив](../../../releases/download/2.4.42/myx-cmake-local-2.4.42.tar.xz ). ## Использование diff --git a/VERSION b/VERSION index 1ab1376..8ec6d1d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.4.41 +2.4.42 diff --git a/debian/CMakeLists.txt b/debian/CMakeLists.txt index 3fae377..9a2af90 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.41 LANGUAGES) +project(myx-cmake VERSION 2.4.42 LANGUAGES) include(GNUInstallDirs) file(WRITE ${CMAKE_SOURCE_DIR}/MyxCMake/MyxCMakeConfigVersion.cmake diff --git a/debian/changelog b/debian/changelog index fd41bad..6a66688 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -myx-cmake (2.4.41) unstable; urgency=medium +myx-cmake (2.4.42) unstable; urgency=medium * New version. diff --git a/myx_setup.cmake b/myx_setup.cmake index 081e9e7..54f2379 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.41 REQUIRED CONFIG PATHS ${MYX_CMAKE_DIR} NO_DEFAULT_PATH) + find_package(MyxCMake 2.4.42 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.41 REQUIRED) + find_package(MyxCMake 2.4.42 REQUIRED) myx_message_notice("== MyxCMake directory: ${MyxCMake_CONFIG} ==") else() include(${PROJECT_SOURCE_DIR}/cmake/myx/MyxCMakeConfig.cmake)