2.0.25

MyxCMake/MyxCMakeConfig.cmake

@@ -25,7 +25,6 @@ endif()
 include(GNUInstallDirs)
 include(CMakeDependentOption)
 
-include(${MYX_CMAKE_LIB_DIR}/macro/SkipExternalTarget.cmake)
 include(${MYX_CMAKE_LIB_DIR}/macro/CreateSymlink.cmake)
 include(${MYX_CMAKE_LIB_DIR}/macro/FindPackages.cmake)
 include(${MYX_CMAKE_LIB_DIR}/macro/InstallRelative.cmake)

MyxCMake/MyxCMakeConfigVersion.cmake

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

MyxCMake/lib/CreatePackages.cmake

@@ -1,7 +1,9 @@
 include_guard(GLOBAL)
 
 function(myx_create_packages TARGET_NAME)
-  myx_skip_external_target(${TARGET_NAME})
+  if(NOT ${PROJECT_BINARY_DIR} STREQUAL ${CMAKE_BINARY_DIR})
+    return()
+  endif()
 
   set(options)
   set(oneValueArgs DEBIAN_PACKAGE_TYPE CPACK_DEBIAN_PACKAGE_SECTION CPACK_DEBIAN_PACKAGE_PRIORITY

MyxCMake/lib/doc/Doxygen.cmake

@@ -9,7 +9,9 @@ function(myx_doc_doxygen TARGET_NAME)
     set(CMAKE_CURRENT_FUNCTION_LIST_DIR ${MYX_CMAKE_LIB_DOC_DIR_BACKPORT})
   endif()
 
-  myx_skip_external_target(${TARGET_NAME})
+  if(NOT ${PROJECT_BINARY_DIR} STREQUAL ${CMAKE_BINARY_DIR})
+    return()
+  endif()
 
   find_package(Doxygen)
   if(DOXYGEN_FOUND)

MyxCMake/lib/macro/SkipExternalTarget.cmake

@@ -1,29 +0,0 @@
-include_guard(GLOBAL)
-
-# Пропуск целей, которые создаются автоматически в `CMAKE_BINARY_DIR`
-macro(myx_skip_external_target TARGET_NAME)
-  get_target_property(__s1 ${TARGET_NAME} INTERFACE_SOURCES)
-  if(__s1)
-    list(APPEND __sources ${__s1})
-  endif()
-  get_target_property(__s2 ${TARGET_NAME} SOURCES)
-  if(__s2)
-    list(APPEND __sources ${__s2})
-  endif()
-
-  foreach(__iter ${__sources})
-    string(FIND ${__iter} ${CMAKE_BINARY_DIR} __pos)
-    if(__pos GREATER -1)
-      unset(__type)
-      unset(__pos)
-      unset(__sources)
-      return()
-    endif()
-  endforeach()
-  unset(__iter)
-  unset(__type)
-  unset(__pos)
-  unset(__sources)
-  unset(__s2)
-  unset(__s1)
-endmacro(myx_skip_external_target TARGET_NAME)

MyxCMake/lib/uncrustify/Uncrustify.cmake

@@ -11,7 +11,9 @@ function(myx_uncrustify TARGET_NAME)
     set(CMAKE_CURRENT_FUNCTION_LIST_DIR ${MYX_CMAKE_LIB_UNCRUSTIFY_DIR_BACKPORT})
   endif()
 
-  myx_skip_external_target(${TARGET_NAME})
+  if(NOT ${PROJECT_BINARY_DIR} STREQUAL ${CMAKE_BINARY_DIR})
+    return()
+  endif()
 
   set(options)
   set(oneValueArgs CONFIG)

README.md

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

VERSION

@@ -1 +1 @@
-2.0.24
+2.0.25

debian/CMakeLists.txt

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

debian/changelog

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