Adds immediate migration results
This commit is contained in:
2395 files changed
+357322
-2524
No files matched your search
@@ -97,6 +97,8 @@ SET(DDS_INSTALL_PATH "SV")
|
||||
SET(WS_INSTALL_PATH "WS")
|
||||
SET(TOOLSWS_INSTALL_PATH "WS")
|
||||
SET(TOOLSSV_INSTALL_PATH "SV")
|
||||
SET(ALL_INSTALL_PATH "")
|
||||
SET(AAR_INSTALL_PATH "SV")
|
||||
IF(WIN32)
|
||||
SET(INSTALL_DEFAULT_ARGS RUNTIME DESTINATION bin
|
||||
LIBRARY DESTINATION bin
|
||||
@@ -109,7 +111,7 @@ ENDIF()
|
||||
SET(INSTALL_DEFAULT_ARGS_DEVEL RUNTIME DESTINATION bin COMPONENT Devel
|
||||
LIBRARY DESTINATION lib COMPONENT Devel
|
||||
ARCHIVE DESTINATION lib COMPONENT Devel)
|
||||
SET(_components SV WS AAR TOOLSWS TOOLSSV HLA)
|
||||
SET(_components ALL SV WS AAR TOOLSWS TOOLSSV HLA)
|
||||
|
||||
|
||||
|
||||
@@ -172,7 +174,7 @@ MACRO(NGL_ADD_TRANSLATION output_location _qm_file_name _ts_file _qm_files)
|
||||
SET(qm "${output_location}/${_qm_file_name}.qm")
|
||||
|
||||
ADD_CUSTOM_COMMAND(OUTPUT ${qm}
|
||||
COMMAND Qt5::lrelease
|
||||
COMMAND Qt6::lrelease
|
||||
ARGS ${_abs_FILE} -qm ${qm}
|
||||
DEPENDS ${_abs_FILE}
|
||||
)
|
||||
@@ -373,8 +375,12 @@ MACRO(_NGL_INSTALL_TARGET_internal _target_NAME)
|
||||
GET_TARGET_PROPERTY(_install_component ${_target_NAME} NGL_INSTALL_${_component})
|
||||
IF(_install_component)
|
||||
SET(_my_args ${_args})
|
||||
NGL_ADD_INSTALL_PREFIX_INTERNAL(_my_args ${${_component}_INSTALL_PATH})
|
||||
INSTALL(TARGETS ${_target_NAME} ${_my_args})
|
||||
IF(NOT "${${_component}_INSTALL_PATH}" STREQUAL "")
|
||||
NGL_ADD_INSTALL_PREFIX_INTERNAL(_my_args ${${_component}_INSTALL_PATH})
|
||||
INSTALL(TARGETS ${_target_NAME} ${_my_args})
|
||||
ELSE()
|
||||
INSTALL(TARGETS ${_target_NAME} ${_my_args})
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
ENDFOREACH()
|
||||
ENDIF()
|
||||
@@ -515,9 +521,14 @@ ENDMACRO()
|
||||
|
||||
macro(NGL_COMPILE_RESOURCES output_qrc_objects)
|
||||
|
||||
# Qt6 path: use qt6_add_resources
|
||||
if(TARGET Qt6::Core)
|
||||
qt6_add_resources(${output_qrc_objects} ${ARGN})
|
||||
return()
|
||||
endif()
|
||||
|
||||
get_property(ipo_active VARIABLE PROPERTY CMAKE_INTERPROCEDURAL_OPTIMIZATION)
|
||||
if(CMAKE_VERSION VERSION_GREATER 3.8.99 AND Qt5Core_VERSION VERSION_GREATER 5.12.99 AND NOT WIN32 AND NOT ipo_active)
|
||||
if(CMAKE_VERSION VERSION_GREATER 3.8.99 AND Qt6Core_VERSION VERSION_GREATER 5.12.99 AND NOT WIN32 AND NOT ipo_active)
|
||||
set(_QT5_INTERNAL_SCOPE ON)
|
||||
|
||||
set(options)
|
||||
@@ -538,7 +549,7 @@ macro(NGL_COMPILE_RESOURCES output_qrc_objects)
|
||||
set_source_files_properties(${qrc_filename} PROPERTIES SKIP_AUTORCC ON)
|
||||
add_custom_command(OUTPUT ${qrc_header_file}
|
||||
COMMAND echo ">>> 1: Regenerating ${qrc_header_file}"
|
||||
COMMAND ${Qt5Core_RCC_EXECUTABLE} ${rcc_options} --name ${qrc_object_file} --pass 1 --output ${qrc_header_file} ${qrc_filename}
|
||||
COMMAND ${Qt6Core_RCC_EXECUTABLE} ${rcc_options} --name ${qrc_object_file} --pass 1 --output ${qrc_header_file} ${qrc_filename}
|
||||
DEPENDS ${qrc_filename} ${_rc_depends} "${_out_depends}"
|
||||
VERBATIM)
|
||||
|
||||
@@ -551,7 +562,7 @@ macro(NGL_COMPILE_RESOURCES output_qrc_objects)
|
||||
|
||||
add_custom_command(OUTPUT ${qrc_object}
|
||||
COMMAND echo ">>> 2: Regenerating ${qrc_object} with $<TARGET_OBJECTS:qrc_object_${qrc_object_file}>"
|
||||
COMMAND ${Qt5Core_RCC_EXECUTABLE}
|
||||
COMMAND ${Qt6Core_RCC_EXECUTABLE}
|
||||
ARGS ${rcc_options} --name ${qrc_object_file} --pass 2 --temp $<TARGET_OBJECTS:qrc_object_${qrc_object_file}> --output ${qrc_object} ${qrc_filename}
|
||||
DEPENDS qrc_object_${qrc_object_file} ${qrc_filename} ${qrc_header_file}
|
||||
VERBATIM)
|
||||
@@ -566,10 +577,14 @@ endmacro()
|
||||
|
||||
|
||||
MACRO(NGL_ADD_BIG_RESOURCES)
|
||||
|
||||
# Qt6 path: use qt6_add_resources
|
||||
if(TARGET Qt6::Core)
|
||||
qt6_add_resources(${ARGN})
|
||||
return()
|
||||
endif()
|
||||
|
||||
GET_PROPERTY(ipo_active VARIABLE PROPERTY CMAKE_INTERPROCEDURAL_OPTIMIZATION)
|
||||
IF(CMAKE_VERSION VERSION_GREATER 3.8.99 AND Qt5Core_VERSION VERSION_GREATER 5.12.99 AND NOT WIN32 AND NOT ipo_active)
|
||||
IF(CMAKE_VERSION VERSION_GREATER 3.8.99 AND Qt6Core_VERSION VERSION_GREATER 5.12.99 AND NOT WIN32 AND NOT ipo_active)
|
||||
QT5_ADD_BIG_RESOURCES(${ARGN})
|
||||
ELSE()
|
||||
QT5_ADD_RESOURCES(${ARGN})
|
||||
@@ -580,7 +595,12 @@ ENDMACRO()
|
||||
|
||||
|
||||
MACRO(NGL_WRAP_UI)
|
||||
QT5_WRAP_UI(${ARGN})
|
||||
# Qt6 path: use qt6_wrap_ui
|
||||
if(TARGET Qt6::Core)
|
||||
qt6_wrap_ui(${ARGN})
|
||||
else()
|
||||
QT5_WRAP_UI(${ARGN})
|
||||
endif()
|
||||
ENDMACRO()
|
||||
|
||||
MACRO(NGL_ADD_APP_ICON_INTERNAL _srcs icon)
|
||||
|
||||
Reference in new issue
Block a user