mux
This commit is contained in:
		@@ -1,4 +1,4 @@
 | 
			
		||||
set(MYX_CMAKE_PACKAGE_VERSION "1.99.75")
 | 
			
		||||
set(MYX_CMAKE_PACKAGE_VERSION "1.99.77")
 | 
			
		||||
if(MYX_CMAKE_PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
 | 
			
		||||
  set(PACKAGE_VERSION_COMPATIBLE FALSE)
 | 
			
		||||
else()
 | 
			
		||||
 
 | 
			
		||||
@@ -7,28 +7,28 @@ function(myx_qt5_target_setup NAME)
 | 
			
		||||
 | 
			
		||||
  cmake_parse_arguments(ARG "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
 | 
			
		||||
 | 
			
		||||
  get_target_property(type ${NAME} TYPE)
 | 
			
		||||
  get_target_property(target_type ${NAME} TYPE)
 | 
			
		||||
 | 
			
		||||
  foreach(iter ${ARG_COMPONENTS})
 | 
			
		||||
    if(type STREQUAL "INTERFACE_LIBRARY")
 | 
			
		||||
    if(target_type STREQUAL "INTERFACE_LIBRARY")
 | 
			
		||||
      target_include_directories(${NAME} INTERFACE ${Qt5${iter}_INCLUDE_DIRS})
 | 
			
		||||
    else()
 | 
			
		||||
      target_include_directories(${NAME} PRIVATE ${Qt5${iter}_INCLUDE_DIRS})
 | 
			
		||||
    endif()
 | 
			
		||||
    if(type STREQUAL "EXECUTABLE" AND NOT iter STREQUAL "LinguistTools")
 | 
			
		||||
    if(target_type STREQUAL "EXECUTABLE" AND NOT iter STREQUAL "LinguistTools")
 | 
			
		||||
      target_link_libraries(${NAME} PRIVATE "Qt5::${iter}")
 | 
			
		||||
     endif()
 | 
			
		||||
  endforeach()
 | 
			
		||||
 | 
			
		||||
  foreach(iter ${ARG_PRIVATE})
 | 
			
		||||
    if(type STREQUAL "INTERFACE_LIBRARY")
 | 
			
		||||
    if(target_type STREQUAL "INTERFACE_LIBRARY")
 | 
			
		||||
      target_include_directories(${NAME} INTERFACE ${Qt5${iter}_PRIVATE_INCLUDE_DIRS})
 | 
			
		||||
    else()
 | 
			
		||||
      target_include_directories(${NAME} PRIVATE ${Qt5${iter}_PRIVATE_INCLUDE_DIRS})
 | 
			
		||||
    endif()
 | 
			
		||||
  endforeach()
 | 
			
		||||
 | 
			
		||||
  if(type STREQUAL "EXECUTABLE")
 | 
			
		||||
  if(target_type STREQUAL "EXECUTABLE")
 | 
			
		||||
    target_compile_options(${NAME} PRIVATE ${Qt5Core_EXECUTABLE_COMPILE_FLAGS})
 | 
			
		||||
  endif()
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -12,7 +12,7 @@ function(myx_target_setup NAME)
 | 
			
		||||
    myx_message_fatal_error("Target ${NAME} does not exists.")
 | 
			
		||||
  endif()
 | 
			
		||||
 | 
			
		||||
  get_target_property(type ${NAME} TYPE)
 | 
			
		||||
  get_target_property(target_type ${NAME} TYPE)
 | 
			
		||||
 | 
			
		||||
  foreach(iter ${ARG_PACKAGES})
 | 
			
		||||
    target_include_directories(${NAME} PRIVATE ${${iter}_INCLUDE_DIRS})
 | 
			
		||||
@@ -48,7 +48,7 @@ function(myx_target_setup NAME)
 | 
			
		||||
    file(MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/include")
 | 
			
		||||
  endif()
 | 
			
		||||
 | 
			
		||||
  if(NOT type STREQUAL "INTERFACE_LIBRARY")
 | 
			
		||||
  if(NOT target_type STREQUAL "INTERFACE_LIBRARY")
 | 
			
		||||
    target_include_directories(${PROJECT_NAME} PRIVATE
 | 
			
		||||
      $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include>)
 | 
			
		||||
 | 
			
		||||
@@ -58,7 +58,7 @@ function(myx_target_setup NAME)
 | 
			
		||||
    endif()
 | 
			
		||||
  endif()
 | 
			
		||||
 | 
			
		||||
  if(type STREQUAL "EXECUTABLE")
 | 
			
		||||
  if(target_type STREQUAL "EXECUTABLE")
 | 
			
		||||
    if(IS_DIRECTORY "${PROJECT_SOURCE_DIR}/include")
 | 
			
		||||
      target_include_directories(${PROJECT_NAME} PRIVATE
 | 
			
		||||
        $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>)
 | 
			
		||||
 
 | 
			
		||||
@@ -96,12 +96,11 @@ configure_file(${git_info_hpp_in_path} \"\${GIT_INFO_FILE}\")
 | 
			
		||||
  if(NOT TARGET ${target}-git-info-header)
 | 
			
		||||
    add_custom_target(${target}-git-info-header ALL
 | 
			
		||||
      ${CMAKE_COMMAND} -DGIT_INFO_FILE=${filename} -P ${git_info_cmake_in_path}
 | 
			
		||||
      BYPRODUCTS ${filename}
 | 
			
		||||
      WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
 | 
			
		||||
  endif()
 | 
			
		||||
# cmake-format: on
 | 
			
		||||
 | 
			
		||||
  file(WRITE ${filename} "")
 | 
			
		||||
 | 
			
		||||
  set_property(TARGET ${target} APPEND PROPERTY PRIVATE_HEADER_FILES ${filename})
 | 
			
		||||
  target_sources(${target} PRIVATE ${filename})
 | 
			
		||||
endfunction()
 | 
			
		||||
 
 | 
			
		||||
@@ -16,11 +16,11 @@ if(MYX_CMAKE_DIR)
 | 
			
		||||
  set(ENV{MYX_CMAKE_DIR} ${MYX_CMAKE_DIR})
 | 
			
		||||
endif()
 | 
			
		||||
if(DEFINED ENV{MYX_CMAKE_DIR})
 | 
			
		||||
  find_package(MyxCMake 1.99.75 CONFIG PATHS $ENV{MYX_CMAKE_DIR} NO_DEFAULT_PATH REQUIRED)
 | 
			
		||||
  find_package(MyxCMake 1.99.77 CONFIG PATHS $ENV{MYX_CMAKE_DIR} NO_DEFAULT_PATH REQUIRED)
 | 
			
		||||
  myx_message_notice("=== MyxCMake directory: ${MyxCMake_CONFIG} ===")
 | 
			
		||||
else()
 | 
			
		||||
  if(MYX_CMAKE_USE_SYSTEM)
 | 
			
		||||
    find_package(MyxCMake 1.99.75 REQUIRED)
 | 
			
		||||
    find_package(MyxCMake 1.99.77 REQUIRED)
 | 
			
		||||
    myx_message_notice("=== MyxCMake directory: ${MyxCMake_CONFIG} ===")
 | 
			
		||||
  else()
 | 
			
		||||
    include(${PROJECT_SOURCE_DIR}/cmake/myx/MyxCMakeConfig.cmake)
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user