MyxCMake/MyxCMakeConfigVersion.cmake

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

MyxCMake/lib/generators/GitInfoHeader.cmake

@@ -31,31 +31,26 @@ function(myx_generate_git_info_header TARGET_NAME BASE_FILENAME)
   set(multiValueArgs)
   cmake_parse_arguments(ARG "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
 
-  set(filename "${PROJECT_BINARY_DIR}/include/${BASE_FILENAME}")
+  set(__filename "${PROJECT_BINARY_DIR}/include/${BASE_FILENAME}")
-  file(APPEND ${filename} "")
+  file(APPEND ${__filename} "")
 
-  set(prefix "")
+  set(__prefix "")
   if(ARG_PREFIX)
     string(APPEND ARG_PREFIX "_")
-    string(REPLACE "-" "_" prefix ${ARG_PREFIX})
+    string(REPLACE "-" "_" __prefix ${ARG_PREFIX})
   endif()
 
 # cmake-format: off
   if(NOT TARGET ${TARGET_NAME}-git-info-header)
     add_custom_target(${TARGET_NAME}-git-info-header ALL
-      ${CMAKE_COMMAND} -DGIT_INFO_FILE=${filename} -DPREFIX=${prefix}
+      ${CMAKE_COMMAND} -DGIT_INFO_FILE=${__filename} -DPREFIX=${__prefix}
                        -P ${CMAKE_CURRENT_FUNCTION_LIST_DIR}/GitInfo.cmake
-      BYPRODUCTS ${filename}
+      BYPRODUCTS ${__filename}
       WORKING_DIRECTORY ${CMAKE_CURRENT_FUNCTION_LIST_DIR})
   endif()
 # cmake-format: on
 
-  set_property(TARGET ${TARGET_NAME} APPEND PROPERTY PRIVATE_HEADER_FILES ${filename})
+  set_property(TARGET ${TARGET_NAME} APPEND PROPERTY PRIVATE_HEADER_FILES ${__filename})
-  get_target_property(target_type ${TARGET_NAME} TYPE)
+  target_sources(${TARGET_NAME} PRIVATE ${__filename})
-  if(${target_type} STREQUAL "INTERFACE_LIBRARY")
-    target_sources(${TARGET_NAME} INTERFACE $<BUILD_INTERFACE:${filename}>)
-  else()
-    target_sources(${TARGET_NAME} PRIVATE ${filename})
-  endif()
   add_dependencies(${TARGET_NAME} ${TARGET_NAME}-git-info-header)
 endfunction()

MyxCMake/lib/generators/PrivateConfigHeader.cmake

@@ -33,7 +33,7 @@ function(myx_generate_private_config_header TARGET_NAME BASE_FILENAME)
   set_property(TARGET ${TARGET_NAME} APPEND PROPERTY PRIVATE_HEADER_FILES ${filename})
   get_target_property(target_type ${TARGET_NAME} TYPE)
   if(${target_type} STREQUAL "INTERFACE_LIBRARY")
-    target_sources(${TARGET_NAME} INTERFACE $<BUILD_INTERFACE:${filename}>)
+    target_sources(${TARGET_NAME} INTERFACE ${filename})
   else()
     target_sources(${TARGET_NAME} PRIVATE ${filename})
   endif()

README.md

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

VERSION

@@ -1 +1 @@
-2.4.33
+2.4.32

debian/CMakeLists.txt

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

debian/changelog

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