MyxCMake/MyxCMakeConfigVersion.cmake

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

MyxCMake/lib/TargetSetup.cmake

@@ -3,8 +3,7 @@ include_guard(GLOBAL)
 function(myx_target_setup TARGET_NAME)
   set(options)
   set(oneValueArgs PCH)
-  set(multiValueArgs PACKAGES
-                     COMPILE_DEFINITIONS INCLUDE_DIRECTORIES LINK_LIBRARIES
+  set(multiValueArgs COMPILE_DEFINITIONS PACKAGES LINK_LIBRARIES
                      CPP PUBLIC_HEADERS PRIVATE_HEADERS)
   cmake_parse_arguments(ARG "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
 
@@ -79,7 +78,6 @@ function(myx_target_setup TARGET_NAME)
   target_sources(${TARGET_NAME} PRIVATE ${ARG_CPP} ${ARG_PCH} ${ARG_PRIVATE_HEADERS})
   target_sources(${TARGET_NAME} PUBLIC $<BUILD_INTERFACE:${ARG_INTERFACE_HEADERS}>)
   target_compile_definitions(${TARGET_NAME} PRIVATE ${ARG_COMPILE_DEFINITIONS})
-  target_include_directories(${TARGET_NAME} PRIVATE ${ARG_INCLUDE_DIRECTORIES})
 
   # CMake до версии 3.12 не умеет извлекать из целей типа `OBJECT_LIBRARY`
   # информацию о заголовочных файлах. Это обход.

MyxCMake/lib/uncrustify/Uncrustify.cmake

@@ -65,6 +65,7 @@ function(myx_uncrustify TARGET_NAME)
     endif()
   endforeach()
 
+  target_sources(${TARGET_NAME} PRIVATE ${ARG_CONFIG})
   set(__fixed_config ${PROJECT_BINARY_DIR}/uncrustify-${TARGET_NAME}.cfg)
   add_custom_command(OUTPUT ${__fixed_config}
                      DEPENDS ${ARG_CONFIG}

README.md

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

VERSION

@@ -1 +1 @@
-2.4.19
+2.4.18

debian/CMakeLists.txt

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

debian/changelog

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