.gitlab-ci.yml

@@ -4,10 +4,6 @@ include:
     ref: master
     file: 'gitlab.yml'
 
-variables:
-# git ssl no verify - git clone works for https/ssl from letsencrypt
-  GIT_SSL_NO_VERIFY: "1"
-
 uncrustify:
   extends:
     - .test-formatting-with-uncrustify

cmake/myx/MyxCMakeConfigVersion.cmake

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

cmake/myx/lib/generators/GitInfoHeader.cmake

@@ -50,11 +50,11 @@ function(myx_generate_git_info_header TARGET_NAME BASE_FILENAME)
   endif()
 # cmake-format: on
 
+  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}>)
   else()
-    set_property(TARGET ${TARGET_NAME} APPEND PROPERTY PRIVATE_HEADER_FILES ${filename})
     target_sources(${TARGET_NAME} PRIVATE ${filename})
   endif()
   add_dependencies(${TARGET_NAME} ${TARGET_NAME}-git-info-header)

cmake/myx/lib/generators/PrivateConfigHeader.cmake

@@ -30,11 +30,11 @@ function(myx_generate_private_config_header TARGET_NAME BASE_FILENAME)
   set(filename "${PROJECT_BINARY_DIR}/include/${BASE_FILENAME}")
   configure_file("${CMAKE_CURRENT_FUNCTION_LIST_DIR}/PrivateConfig.hpp.in" ${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}>)
   else()
-    set_property(TARGET ${TARGET_NAME} APPEND PROPERTY PRIVATE_HEADER_FILES ${filename})
     target_sources(${TARGET_NAME} PRIVATE ${filename})
   endif()
 endfunction()

cmake/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.38 REQUIRED CONFIG PATHS ${MYX_CMAKE_DIR} NO_DEFAULT_PATH)
+  find_package(MyxCMake 2.4.37 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.38 REQUIRED)
+    find_package(MyxCMake 2.4.37 REQUIRED)
     myx_message_notice("== MyxCMake directory: ${MyxCMake_CONFIG} ==")
   else()
     include(${PROJECT_SOURCE_DIR}/cmake/myx/MyxCMakeConfig.cmake)