2.4.39

MyxCMake/MyxCMakeConfigVersion.cmake

@@ -1,4 +1,4 @@
-set(MYX_CMAKE_PACKAGE_VERSION "2.4.38")
+set(MYX_CMAKE_PACKAGE_VERSION "2.4.39")
 if(MYX_CMAKE_PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
   set(PACKAGE_VERSION_COMPATIBLE FALSE)
 else()

MyxCMake/lib/macro/FindQt.cmake

@@ -22,13 +22,20 @@ macro(myx_find_qt)
     message(FATAL_ERROR "Supported Qt versions are 5 and 6")
   endif()
 
+  if(ARG_REQUIRED)
+    myx_message_notice("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)
+    myx_message_notice("MyxCMake: searching required Qt components: ${ARG_COMPONENTS}")
+  endif()
   foreach(iter ${ARG_COMPONENTS})
     find_package(Qt${ARG_VERSION} COMPONENTS ${iter} ${ARG_REQUIRED})
   endforeach()
 
-  foreach(iter ${ARG_PRIVATE})
-    find_package("Qt${ARG_VERSION}${iter}" COMPONENTS Private ${ARG_REQUIRED})
-  endforeach()
 
   foreach(iter IN LISTS oneValueArgs multiValueArgs)
     unset(ARG_${iter})

README.md

@@ -3,7 +3,7 @@
 ## Установка
 
 В корневом каталоге проекта создать каталог `cmake` и распаковать в него
-[архив](../../../releases/download/2.4.38/myx-cmake-local-2.4.38.tar.xz ).
+[архив](../../../releases/download/2.4.39/myx-cmake-local-2.4.39.tar.xz ).
 
 ## Использование
 

VERSION

@@ -1 +1 @@
-2.4.38
+2.4.39

debian/CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.6 FATAL_ERROR)
-project(myx-cmake VERSION 2.4.38 LANGUAGES)
+project(myx-cmake VERSION 2.4.39 LANGUAGES)
 
 include(GNUInstallDirs)
 file(WRITE ${CMAKE_SOURCE_DIR}/MyxCMake/MyxCMakeConfigVersion.cmake

debian/changelog

@@ -1,4 +1,4 @@
-myx-cmake (2.4.38) unstable; urgency=medium
+myx-cmake (2.4.39) unstable; urgency=medium
 
   * New version.
 

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.38 REQUIRED CONFIG PATHS ${MYX_CMAKE_DIR} NO_DEFAULT_PATH)
+  find_package(MyxCMake 2.4.39 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.38 REQUIRED)
+    find_package(MyxCMake 2.4.39 REQUIRED)
     myx_message_notice("== MyxCMake directory: ${MyxCMake_CONFIG} ==")
   else()
     include(${PROJECT_SOURCE_DIR}/cmake/myx/MyxCMakeConfig.cmake)