Adds immediate migration results
This commit is contained in:
2395 files changed
+357322
-2524
No files matched your search
@@ -26,8 +26,12 @@ ELSE()
|
||||
INCLUDE(FindLibraryWithDebug)
|
||||
INCLUDE(FindPackageHandleStandardArgs)
|
||||
|
||||
SET(QT_MIN_VERSION 5.4.0)
|
||||
FIND_PACKAGE(Qt5 COMPONENTS Core Gui Location Network Sensors REQUIRED)
|
||||
SET(QT_MIN_VERSION 6.0.0)
|
||||
FIND_PACKAGE(Qt6 COMPONENTS Core Gui Location Network Sensors)
|
||||
IF (NOT Qt6_FOUND)
|
||||
MESSAGE(WARNING "Qt6 not found; skipping ArcGIS")
|
||||
RETURN()
|
||||
ENDIF()
|
||||
|
||||
SET(_arcgis_include_hint "/usr/include")
|
||||
SET(_arcgis_library_hint "/usr/lib64")
|
||||
@@ -93,10 +97,10 @@ IF(NOT TARGET ArcGIS::ArcGIS)
|
||||
ENDIF()
|
||||
|
||||
SET_PROPERTY(TARGET ArcGIS::ArcGIS PROPERTY INTERFACE_INCLUDE_DIRECTORIES
|
||||
$<TARGET_PROPERTY:Qt5::Core,INTERFACE_INCLUDE_DIRECTORIES>
|
||||
$<TARGET_PROPERTY:Qt5::Location,INTERFACE_INCLUDE_DIRECTORIES>
|
||||
$<TARGET_PROPERTY:Qt5::Network,INTERFACE_INCLUDE_DIRECTORIES>
|
||||
$<TARGET_PROPERTY:Qt5::Sensors,INTERFACE_INCLUDE_DIRECTORIES>
|
||||
$<TARGET_PROPERTY:Qt6::Core,INTERFACE_INCLUDE_DIRECTORIES>
|
||||
$<TARGET_PROPERTY:Qt6::Location,INTERFACE_INCLUDE_DIRECTORIES>
|
||||
$<TARGET_PROPERTY:Qt6::Network,INTERFACE_INCLUDE_DIRECTORIES>
|
||||
$<TARGET_PROPERTY:Qt6::Sensors,INTERFACE_INCLUDE_DIRECTORIES>
|
||||
)
|
||||
|
||||
IF (UNIX)
|
||||
|
||||
@@ -1,12 +1,19 @@
|
||||
# Minimal Find module for Grantlee5 to allow configure to continue when not installed
|
||||
# This intentionally does not attempt to build or provide Qt5-based Grantlee
|
||||
# If a Qt6-compatible Grantlee is available, set Grantlee5_DIR or install the package
|
||||
# Find module for Grantlee5 (Qt5) / Grantlee (Qt6 compatible)
|
||||
# Grantlee 5.3.0 provides Qt6-compatible targets
|
||||
|
||||
if (TARGET Grantlee5::Templates)
|
||||
set(Grantlee5_FOUND TRUE)
|
||||
return()
|
||||
endif()
|
||||
|
||||
# Try config-mode: look for Grantlee5Config.cmake in standard locations
|
||||
# Grantlee 5.3.0 installs to /usr/local/lib/cmake/Grantlee5/
|
||||
find_package(Grantlee5 CONFIG QUIET)
|
||||
if(TARGET Grantlee5::Templates)
|
||||
set(Grantlee5_FOUND TRUE)
|
||||
return()
|
||||
endif()
|
||||
|
||||
# Try pkg-config as a best-effort (may fail)
|
||||
find_package(PkgConfig QUIET)
|
||||
if (PKG_CONFIG_FOUND)
|
||||
@@ -21,8 +28,7 @@ endif()
|
||||
# Try config-mode: look for Grantlee5Config.cmake in CMAKE_PREFIX_PATH or installed location
|
||||
# Try to locate Grantlee5Config.cmake via common locations: CMAKE_PREFIX_PATH, EXTERNAL_DIR, repo/external, and typical install paths
|
||||
find_file(_Grantlee5Config NAMES Grantlee5Config.cmake
|
||||
PATHS ${CMAKE_PREFIX_PATH} $ENV{EXTERNAL_DIR} /repo/external /repo/external/grantlee
|
||||
NO_DEFAULT_PATH
|
||||
PATHS ${CMAKE_PREFIX_PATH} $ENV{EXTERNAL_DIR} /repo/external /repo/external/grantlee /usr/local/lib/cmake/Grantlee5
|
||||
PATH_SUFFIXES Grantlee5 lib/cmake/Grantlee5)
|
||||
if(_Grantlee5Config)
|
||||
include(${_Grantlee5Config})
|
||||
|
||||
@@ -1,13 +1,8 @@
|
||||
|
||||
|
||||
# Prefer Qt6 when available, fallback to Qt5
|
||||
find_package(Qt6 COMPONENTS Core Gui PrintSupport Sql Svg Widgets Xml QUIET)
|
||||
if(NOT Qt6_FOUND)
|
||||
FIND_PACKAGE(Qt5 COMPONENTS Core Gui PrintSupport Sql Svg Widgets Xml REQUIRED)
|
||||
set(_qt_prefix "Qt5")
|
||||
else()
|
||||
set(_qt_prefix "Qt6")
|
||||
endif()
|
||||
# Qt6 only - no Qt5 fallback
|
||||
find_package(Qt6 COMPONENTS Core Gui PrintSupport Sql Svg Widgets Xml REQUIRED)
|
||||
set(_qt_prefix "Qt6")
|
||||
|
||||
# If KDReports already provided via variables, use them
|
||||
IF(KDREPORTS_INCLUDE_DIR AND KDREPORTS_KDREPORTS_INCLUDE_DIR AND KDREPORTS_LIBRARY)
|
||||
@@ -15,14 +10,19 @@ IF(KDREPORTS_INCLUDE_DIR AND KDREPORTS_KDREPORTS_INCLUDE_DIR AND KDREPORTS_LIBRA
|
||||
SET(KDReports_FOUND TRUE)
|
||||
ELSE()
|
||||
# Prefer KDReports-qt6 package config if installed under standard prefixes
|
||||
if(EXISTS "${CMAKE_PREFIX_PATH}/lib/cmake/KDReports-qt6" OR EXISTS "/usr/local/lib/cmake/KDReports-qt6")
|
||||
message(STATUS "Found KDReports-qt6 package config in CMAKE_PREFIX_PATH or /usr/local")
|
||||
if(EXISTS "${CMAKE_PREFIX_PATH}/lib64/cmake/KDReports-qt6" OR EXISTS "/usr/local/lib64/cmake/KDReports-qt6" OR EXISTS "${CMAKE_PREFIX_PATH}/lib/cmake/KDReports-qt6" OR EXISTS "/usr/local/lib/cmake/KDReports-qt6")
|
||||
message(STATUS "Found KDReports-qt6 package config")
|
||||
set(KDREPORTS_FOUND TRUE)
|
||||
set(KDReports_FOUND TRUE)
|
||||
# Best-effort defaults; specific projects will use the imported target below
|
||||
set(KDREPORTS_INCLUDE_DIR "/usr/local/include")
|
||||
set(KDREPORTS_KDREPORTS_INCLUDE_DIR "/usr/local/include")
|
||||
set(KDREPORTS_LIBRARY "/usr/local/lib/libkdreports-qt6.so")
|
||||
set(KDREPORTS_INCLUDE_DIR "/usr/local/include/KDReports-qt6")
|
||||
set(KDREPORTS_KDREPORTS_INCLUDE_DIR "/usr/local/include/KDReports-qt6")
|
||||
# Check lib64 first, then lib
|
||||
if(EXISTS "/usr/local/lib64/libkdreports-qt6.so")
|
||||
set(KDREPORTS_LIBRARY "/usr/local/lib64/libkdreports-qt6.so")
|
||||
else()
|
||||
set(KDREPORTS_LIBRARY "/usr/local/lib/libkdreports-qt6.so")
|
||||
endif()
|
||||
else()
|
||||
FIND_PATH(KDREPORTS_INCLUDE_DIR KDReports/KDReports.h)
|
||||
FIND_PATH(KDREPORTS_KDREPORTS_INCLUDE_DIR KDReports.h PATH_SUFFIXES KDReports)
|
||||
|
||||
+17
-17
@@ -24,14 +24,14 @@ if(NOT WIN32)
|
||||
|
||||
|
||||
include(FindPkgConfig)
|
||||
# Prefer poppler-qt6 if available, fall back to poppler-qt5
|
||||
# Prefer poppler-qt6 if available, fall back to poppler-qt6
|
||||
pkg_check_modules(_pc_poppler poppler-qt6)
|
||||
if(_pc_poppler_FOUND)
|
||||
set(_pc_poppler_pkgname poppler-qt6)
|
||||
else()
|
||||
pkg_check_modules(_pc_poppler poppler-qt5)
|
||||
pkg_check_modules(_pc_poppler poppler-qt6)
|
||||
if(_pc_poppler_FOUND)
|
||||
set(_pc_poppler_pkgname poppler-qt5)
|
||||
set(_pc_poppler_pkgname poppler-qt6)
|
||||
endif()
|
||||
endif()
|
||||
if(_pc_poppler_FOUND)
|
||||
@@ -44,7 +44,7 @@ endif(NOT WIN32)
|
||||
if(NOT _poppler_version_bad)
|
||||
set(POPPLER_QT5_FOUND FALSE)
|
||||
|
||||
# try library name discovered by pkg-config (poppler-qt6 or poppler-qt5)
|
||||
# try library name discovered by pkg-config (poppler-qt6 or poppler-qt6)
|
||||
# Attempt to use pkg-config-provided absolute library path variable if available
|
||||
if(_pc_poppler_FOUND)
|
||||
# construct the variable name pkgcfg_lib__pc_poppler_<pkgname>
|
||||
@@ -62,19 +62,19 @@ if(NOT _poppler_version_bad)
|
||||
endif()
|
||||
# fallback: try common library names if pkg-config hints didn't help
|
||||
if(NOT POPPLER_QT5_LIBRARY)
|
||||
find_library(POPPLER_QT5_LIBRARY NAMES poppler-qt6 poppler-qt5)
|
||||
find_library(POPPLER_QT5_LIBRARY NAMES poppler-qt6 poppler-qt6)
|
||||
endif()
|
||||
# extra fallback paths commonly used on Debian/Ubuntu
|
||||
if(NOT POPPLER_QT5_LIBRARY)
|
||||
find_library(POPPLER_QT5_LIBRARY NAMES poppler-qt6 poppler-qt5 PATHS /usr/lib/x86_64-linux-gnu /usr/lib /usr/local/lib)
|
||||
find_library(POPPLER_QT5_LIBRARY NAMES poppler-qt6 poppler-qt6 PATHS /usr/lib/x86_64-linux-gnu /usr/lib /usr/local/lib)
|
||||
endif()
|
||||
|
||||
# check for headers for both qt5 and qt6 layouts
|
||||
find_path(POPPLER_QT5_INCLUDE_DIR poppler-qt6.h poppler-qt5.h
|
||||
find_path(POPPLER_QT5_INCLUDE_DIR poppler-qt6.h poppler-qt6.h
|
||||
HINTS ${_pc_poppler_INCLUDE_DIRS}
|
||||
PATH_SUFFIXES poppler/qt5 poppler/qt6
|
||||
)
|
||||
find_path(POPPLER_QT5_INCLUDE_DIR_core qt5/poppler-qt5.h qt6/poppler-qt6.h
|
||||
find_path(POPPLER_QT5_INCLUDE_DIR_core qt5/poppler-qt6.h qt6/poppler-qt6.h
|
||||
HINTS ${_pc_poppler_INCLUDE_DIRS}
|
||||
PATH_SUFFIXES poppler
|
||||
)
|
||||
@@ -83,9 +83,9 @@ if(NOT _poppler_version_bad)
|
||||
list(APPEND POPPLER_QT5_INCLUDE_DIR "${POPPLER_QT5_INCLUDE_DIR_core}")
|
||||
set(POPPLER_QT5_FOUND TRUE)
|
||||
# Expose a modern imported target for consumers
|
||||
if(NOT TARGET PopplerQt5::Poppler)
|
||||
add_library(PopplerQt5::Poppler UNKNOWN IMPORTED)
|
||||
set_target_properties(PopplerQt5::Poppler PROPERTIES
|
||||
if(NOT TARGET PopplerQt6::Poppler)
|
||||
add_library(PopplerQt6::Poppler UNKNOWN IMPORTED)
|
||||
set_target_properties(PopplerQt6::Poppler PROPERTIES
|
||||
IMPORTED_LOCATION "${POPPLER_QT5_LIBRARY}"
|
||||
INTERFACE_INCLUDE_DIRECTORIES "${POPPLER_QT5_INCLUDE_DIR}"
|
||||
)
|
||||
@@ -98,18 +98,18 @@ endif(NOT _poppler_version_bad)
|
||||
|
||||
if(POPPLER_QT5_LIBRARY AND POPPLER_QT5_INCLUDE_DIR)
|
||||
INCLUDE(FindPackageHandleStandardArgs)
|
||||
FIND_PACKAGE_HANDLE_STANDARD_ARGS(PopplerQt5 DEFAULT_MSG
|
||||
FIND_PACKAGE_HANDLE_STANDARD_ARGS(PopplerQt6 DEFAULT_MSG
|
||||
POPPLER_QT5_LIBRARY
|
||||
POPPLER_QT5_INCLUDE_DIR)
|
||||
else()
|
||||
# Poppler Qt bindings not found — create placeholder target/variables so projects using FIND_PACKAGE(PopplerQt5 REQUIRED)
|
||||
# Poppler Qt bindings not found — create placeholder target/variables so projects using FIND_PACKAGE(PopplerQt6 REQUIRED)
|
||||
# do not fail at configure time. Real functionality will require installing poppler-qt6 or updating code.
|
||||
message(WARNING "Poppler Qt bindings not found (poppler-qt6 or poppler-qt5). Creating placeholder PopplerQt5::Poppler target to allow configure.")
|
||||
message(WARNING "Poppler Qt bindings not found (poppler-qt6 or poppler-qt6). Creating placeholder PopplerQt6::Poppler target to allow configure.")
|
||||
set(POPPLER_QT5_LIBRARY "" CACHE STRING "Placeholder poppler library" FORCE)
|
||||
set(POPPLER_QT5_INCLUDE_DIR "" CACHE STRING "Placeholder poppler include dir" FORCE)
|
||||
if(NOT TARGET PopplerQt5::Poppler)
|
||||
add_library(PopplerQt5::Poppler UNKNOWN IMPORTED)
|
||||
set_property(TARGET PopplerQt5::Poppler PROPERTY INTERFACE_INCLUDE_DIRECTORIES "")
|
||||
if(NOT TARGET PopplerQt6::Poppler)
|
||||
add_library(PopplerQt6::Poppler UNKNOWN IMPORTED)
|
||||
set_property(TARGET PopplerQt6::Poppler PROPERTY INTERFACE_INCLUDE_DIRECTORIES "")
|
||||
endif()
|
||||
set(POPPLER_QT5_FOUND TRUE CACHE INTERNAL "Poppler placeholder present")
|
||||
endif()
|
||||
@@ -63,7 +63,14 @@ IF(NOT RTI_DIR)
|
||||
ELSE(WIN32)
|
||||
SET(_RTI_DIR $ENV{DDS_PATH})
|
||||
IF(NOT _RTI_DIR)
|
||||
SET(_RTI_DIR "/opt/RTI")
|
||||
# Try local external directory first
|
||||
IF(EXISTS "${CMAKE_SOURCE_DIR}/../external/rti_connext_dds-7.7.0")
|
||||
SET(_RTI_DIR "${CMAKE_SOURCE_DIR}/../external/rti_connext_dds-7.7.0")
|
||||
ELSEIF(EXISTS "${CMAKE_SOURCE_DIR}/external/rti_connext_dds-7.7.0")
|
||||
SET(_RTI_DIR "${CMAKE_SOURCE_DIR}/external/rti_connext_dds-7.7.0")
|
||||
ELSE()
|
||||
SET(_RTI_DIR "/opt/RTI")
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
IF(NOT EXISTS "${_RTI_DIR}" OR NOT IS_DIRECTORY "${_RTI_DIR}")
|
||||
MESSAGE(WARNING "RTI directory ${_RTI_DIR} not found; continuing without RTI. Set DDS_PATH to RTI installation to enable RTI features.")
|
||||
@@ -152,29 +159,26 @@ SET(_RTI_LIBS nddscore nddsc nddscpp2 rtiroutingservice)
|
||||
SET(_libs "")
|
||||
SET(_lib_vars "")
|
||||
|
||||
# Try recursive search for RTI libraries under RTI_DIR to handle vendor arch subdirs (e.g. x64Linux4gcc8.5.0)
|
||||
foreach(_lib IN LISTS _RTI_LIBS)
|
||||
file(GLOB_RECURSE _found_libs "${RTI_DIR}/lib/**/lib${_lib}.*")
|
||||
list(LENGTH _found_libs _found_count)
|
||||
if(_found_count GREATER 0)
|
||||
list(GET _found_libs 0 _first)
|
||||
set("RTI_${_lib}_LIBRARY" "${_first}" CACHE STRING "RTI library ${_lib}" FORCE)
|
||||
# Build list of library search paths including arch-specific subdirs
|
||||
set(_rti_lib_search_paths "${RTI_DIR}/lib")
|
||||
if(EXISTS "${RTI_DIR}/lib/${_rti_gcc_arch}")
|
||||
list(APPEND _rti_lib_search_paths "${RTI_DIR}/lib/${_rti_gcc_arch}")
|
||||
endif()
|
||||
# Also scan for any arch subdirs under lib/
|
||||
file(GLOB _rti_arch_dirs "${RTI_DIR}/lib/*")
|
||||
foreach(_arch_dir IN LISTS _rti_arch_dirs)
|
||||
if(IS_DIRECTORY "${_arch_dir}")
|
||||
list(APPEND _rti_lib_search_paths "${_arch_dir}")
|
||||
endif()
|
||||
endforeach()
|
||||
|
||||
FOREACH(_lib ${_RTI_LIBS})
|
||||
SET(_libname "RTI_${_lib}_LIBRARY")
|
||||
IF (NOT ${_libname})
|
||||
# Add any arch-specific subdirectories under RTI lib to search hints
|
||||
file(GLOB _rti_lib_candidates RELATIVE "${RTI_DIR}" "${RTI_DIR}/lib/*")
|
||||
set(_rti_lib_full_paths "${RTI_DIR}/lib")
|
||||
foreach(_p IN LISTS _rti_lib_candidates)
|
||||
list(APPEND _rti_lib_full_paths "${RTI_DIR}/lib/${_p}")
|
||||
endforeach()
|
||||
FIND_LIBRARY_WITH_DEBUG("${_libname}"
|
||||
WIN32_DEBUG_POSTFIX d
|
||||
NAMES ${_lib}
|
||||
HINTS ${_rti_library_hint} ${RTI_DIR}/lib ${RTI_DIR}/lib/${_rti_gcc_arch} ${_rti_lib_full_paths})
|
||||
HINTS ${_rti_lib_search_paths})
|
||||
ENDIF()
|
||||
SET(_tgt_name RTI::${_lib})
|
||||
|
||||
|
||||
@@ -56,7 +56,7 @@ MACRO(_CODEGEN_ACTION action srcList xmlIn in_files out_files)
|
||||
|
||||
|
||||
|
||||
SET(_cg codegen)
|
||||
SET(_cg ngl_codegen)
|
||||
ADD_CUSTOM_COMMAND(OUTPUT ${${out_files}}
|
||||
COMMAND ${_cg}
|
||||
ARGS -s ${xmlIn}
|
||||
@@ -95,7 +95,7 @@ MACRO(CODEGEN_DATABASE_SQL srcList xmlFile_in)
|
||||
)
|
||||
_CODEGEN_ACTION("DATABASE" ${srcList} ${xmlFile_in} in_files out_files ${ARGN})
|
||||
IF(NOT POLICY CMP0071)
|
||||
QT5_WRAP_CPP(${srcList} "${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_db.h"
|
||||
QT6_WRAP_CPP(${srcList} "${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_db.h"
|
||||
"${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_db_impl.h")
|
||||
ENDIF()
|
||||
ENDMACRO()
|
||||
@@ -110,7 +110,7 @@ MACRO(CODEGEN_DAO srcList xmlFile_in)
|
||||
)
|
||||
_CODEGEN_ACTION("dao" ${srcList} ${xmlFile_in} in_files out_files ${ARGN})
|
||||
IF(NOT POLICY CMP0071)
|
||||
QT5_WRAP_CPP(${srcList} "${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_dao.cpp"
|
||||
QT6_WRAP_CPP(${srcList} "${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_dao.cpp"
|
||||
"${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_dao.h")
|
||||
ENDIF()
|
||||
ENDMACRO()
|
||||
@@ -131,7 +131,7 @@ MACRO(CODEGEN_DATABASE srcList xmlFile_in)
|
||||
)
|
||||
_CODEGEN_ACTION("DATABASE_SERVER" ${srcList} ${xmlFile_in} in_files out_files ${ARGN})
|
||||
IF(NOT POLICY CMP0071)
|
||||
QT5_WRAP_CPP(${srcList} "${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_db.h"
|
||||
QT6_WRAP_CPP(${srcList} "${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_db.h"
|
||||
"${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_db_impl.h")
|
||||
ENDIF()
|
||||
ENDMACRO()
|
||||
@@ -170,12 +170,12 @@ MACRO(CODEGEN_SQL srcList xmlFile_in)
|
||||
ADD_CUSTOM_COMMAND(OUTPUT ${out_file_sql}
|
||||
COMMAND ${CMAKE_COMMAND}
|
||||
ARGS -E make_directory ${out_dir_sql}
|
||||
COMMAND codegen
|
||||
COMMAND ngl_codegen
|
||||
ARGS -s ${xmlFile_in}
|
||||
-a ${action}
|
||||
-o ${out_dir_sql}
|
||||
-i ${CMAKE_BINARY_DIR}/service_idl_files.txt
|
||||
DEPENDS ${_cg} ${xmlFile_in}
|
||||
DEPENDS ngl_codegen ${xmlFile_in}
|
||||
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
|
||||
)
|
||||
LIST(APPEND ${srcList} ${out_file_sql})
|
||||
@@ -230,7 +230,10 @@ MACRO(CODEGEN_IDL_SVC srcList xmlFile_in)
|
||||
CODEGEN_HANDLE_SVC_XML(${srcList} ${xmlFile_in})
|
||||
ENDMACRO()
|
||||
|
||||
FIND_PACKAGE(PythonInterp 2.7 REQUIRED)
|
||||
# Use Python 3 (Python 2.7 not available on modern distributions like openSUSE Leap 16.0)
|
||||
FIND_PACKAGE(Python3 COMPONENTS Interpreter REQUIRED)
|
||||
SET(PYTHON_EXECUTABLE ${Python3_EXECUTABLE})
|
||||
|
||||
MACRO(CODEGEN_TOPIC_TYPEDEFS srcList xmlFile_in)
|
||||
_GET_SERVICENAME( "${xmlFile_in}" svcNameOut )
|
||||
SET(inFile ${xmlFile_in})
|
||||
@@ -291,7 +294,7 @@ MACRO(CODEGEN_CLIENT_TOPICS_IFC srcList xmlFile_in)
|
||||
"${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_dtc.h"
|
||||
)
|
||||
IF(NOT POLICY CMP0071)
|
||||
QT5_WRAP_CPP(${srcList} "${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_dtc.h")
|
||||
QT6_WRAP_CPP(${srcList} "${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_dtc.h")
|
||||
ENDIF()
|
||||
ELSEIF(part STREQUAL "FTC")
|
||||
LIST(APPEND in_files
|
||||
@@ -330,7 +333,7 @@ MACRO(CODEGEN_CLIENT_TOPICS_IMPL srcList xmlFile_in)
|
||||
"${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_dtc_impl.cpp"
|
||||
)
|
||||
IF(NOT POLICY CMP0071)
|
||||
QT5_WRAP_CPP(${srcList} "${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_dtc_impl.h")
|
||||
QT6_WRAP_CPP(${srcList} "${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_dtc_impl.h")
|
||||
ENDIF()
|
||||
ELSEIF(part STREQUAL "FTC")
|
||||
LIST(APPEND in_files
|
||||
@@ -342,7 +345,7 @@ MACRO(CODEGEN_CLIENT_TOPICS_IMPL srcList xmlFile_in)
|
||||
"${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_ftc_impl.cpp"
|
||||
)
|
||||
IF(NOT POLICY CMP0071)
|
||||
QT5_WRAP_CPP(${srcList} "${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_ftc_impl.h")
|
||||
QT6_WRAP_CPP(${srcList} "${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_ftc_impl.h")
|
||||
ENDIF()
|
||||
ELSE()
|
||||
MESSAGE(FATAL_ERROR "Unkown part argument for CODEGEN_SERVER_TOPICS (${part})")
|
||||
@@ -387,7 +390,7 @@ MACRO(CODEGEN_SERVER_TOPICS srcList xmlFile_in)
|
||||
"${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_fts_impl.cpp"
|
||||
)
|
||||
IF(NOT POLICY CMP0071)
|
||||
QT5_WRAP_CPP(${srcList} ${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_fts_impl.h)
|
||||
QT6_WRAP_CPP(${srcList} ${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_fts_impl.h)
|
||||
ENDIF()
|
||||
ELSE()
|
||||
MESSAGE(FATAL_ERROR "Unkown part argument for CODEGEN_SERVER_TOPICS (${part})")
|
||||
@@ -410,7 +413,7 @@ MACRO(CODEGEN_TOPIC_TYPE_PLUGIN srcList xmlFile_in)
|
||||
)
|
||||
_CODEGEN_ACTION("DDS_TOPICS" ${srcList} "${xmlFile_in}" in_files out_files)
|
||||
IF(NOT POLICY CMP0071)
|
||||
QT5_WRAP_CPP(${srcList} ${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_topic_type_plugin.h)
|
||||
QT6_WRAP_CPP(${srcList} ${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_topic_type_plugin.h)
|
||||
ENDIF()
|
||||
ENDMACRO()
|
||||
|
||||
@@ -453,7 +456,7 @@ MACRO(CODEGEN_RECORD_REPLAY_PLUGIN srcList xmlFile_in)
|
||||
)
|
||||
_CODEGEN_ACTION("DDS_TOPICS" ${srcList} "${xmlFile_in}" in_files out_files)
|
||||
IF(NOT POLICY CMP0071)
|
||||
QT5_WRAP_CPP(${srcList} ${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_record_replay_plugin.h)
|
||||
QT6_WRAP_CPP(${srcList} ${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_record_replay_plugin.h)
|
||||
ENDIF()
|
||||
ENDMACRO()
|
||||
|
||||
|
||||
@@ -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