2.4.44

MyxCMake/MyxCMakeConfigVersion.cmake

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

MyxCMake/lib/DownloadContent.cmake

@@ -70,7 +70,11 @@ function(myx_download_content NAME)
   if(ENABLE_DOWNLOAD_CONTENT AND GIT_EXECUTABLE AND ARG_GIT_REPOSITORY)
     if(NOT IS_DIRECTORY ${WORK_DIR})
       execute_process(COMMAND ${GIT_EXECUTABLE} clone ${ARG_GIT_REPOSITORY} ${NAME}
-                      WORKING_DIRECTORY ${ARG_DOWNLOAD_DIR})
+                      WORKING_DIRECTORY ${ARG_DOWNLOAD_DIR}
+                      RESULT_VARIABLE clone_result)
+      if(NOT clone_result EQUAL 0)
+        myx_message_fatal_error("Git can't clone ${NAME} from ${ARG_GIT_REPOSITORY}")
+      endif()
     else()
       if(ARG_AUTOFETCH)
         execute_process(COMMAND ${GIT_EXECUTABLE} fetch

MyxCMake/lib/doc/Doxyfile.in

@@ -29,3 +29,9 @@ TEMPLATE_RELATIONS     = YES
 CALL_GRAPH             = YES
 CALLER_GRAPH           = YES
 INTERACTIVE_SVG        = YES
+
+ENABLE_PREPROCESSING   = YES
+MACRO_EXPANSION        = YES
+EXPAND_ONLY_PREDEF     = YES
+PREDEFINED             = __attribute__(x)=
+

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})

README.md

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

VERSION

@@ -1 +1 @@
-2.4.41
+2.4.44

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.44 LANGUAGES)
 
 include(GNUInstallDirs)
 file(WRITE ${CMAKE_SOURCE_DIR}/MyxCMake/MyxCMakeConfigVersion.cmake

debian/changelog

@@ -1,4 +1,4 @@
-myx-cmake (2.4.41) unstable; urgency=medium
+myx-cmake (2.4.44) 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.41 REQUIRED CONFIG PATHS ${MYX_CMAKE_DIR} NO_DEFAULT_PATH)
+  find_package(MyxCMake 2.4.44 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.44 REQUIRED)
     myx_message_notice("== MyxCMake directory: ${MyxCMake_CONFIG} ==")
   else()
     include(${PROJECT_SOURCE_DIR}/cmake/myx/MyxCMakeConfig.cmake)