2.4.7

MyxCMake/MyxCMakeConfigVersion.cmake

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

MyxCMake/lib/macro/QtTargetSetup.cmake

@@ -128,7 +128,7 @@ function(myx_qt_target_setup_post TARGET_NAME)
   # Формирование файла ресурсов с переводами
   if("LinguistTools" IN_LIST ARG_COMPONENTS AND tr)
     # Заглавие файла ресурсов
-    file(WRITE ${PROJECT_BINARY_DIR}/${TARGET_NAME}_l10n.qrc "<RCC><qresource prefix=\"/qm\">\n")
+    file(WRITE ${PROJECT_BINARY_DIR}/${TARGET_NAME}_l10n.qrc "<RCC><qresource prefix=\"/l10n\">\n")
     # Для каждого языка, указанное в параметре LANGS
     foreach(iter ${ARG_LANGS})
       # Создание или обновление файла переводов в каталоге ${PROJECT_SOURCE_DIR}/l10n

MyxCMake/lib/uncrustify/Uncrustify.cmake

@@ -9,10 +9,6 @@ function(myx_uncrustify TARGET_NAME)
     set(CMAKE_CURRENT_FUNCTION_LIST_DIR ${MYX_CMAKE_LIB_UNCRUSTIFY_DIR_BACKPORT})
   endif()
 
-  if(NOT ${PROJECT_BINARY_DIR} STREQUAL ${CMAKE_BINARY_DIR})
-    return()
-  endif()
-
   set(options)
   set(oneValueArgs CONFIG)
   set(multiValueArgs)
@@ -32,6 +28,12 @@ function(myx_uncrustify TARGET_NAME)
     return()
   endif()
 
+  get_filename_component(CONFIG_DIR ${ARG_CONFIG} DIRECTORY)
+  if(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CONFIG_DIR}")
+    myx_message("MyxCMake: skip uncrustify for project ${PROJECT_NAME}")
+    return()
+  endif()
+
   if(NOT TARGET myx-uncrustify)
     add_custom_target(myx-uncrustify)
   endif()

README.md

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

VERSION

@@ -1 +1 @@
-2.4.6
+2.4.7

debian/CMakeLists.txt

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

debian/changelog

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