qt6: nglcompression, widgets, dialog fixes: remove QTextCodec, QStringRef/splitRef, QDesktopWidget, use QMultiMap and Qt6 APIs; adjust QtConcurrent::run wrappers; replace endl with newline
This commit is contained in:
1 parent
17f1c61c9e
commit
f744a8c37a
328 files changed
+53567
-112
No files matched your search
+21
-11
@@ -65,9 +65,12 @@ IF(NOT RTI_DIR)
|
||||
IF(NOT _RTI_DIR)
|
||||
SET(_RTI_DIR "/opt/RTI")
|
||||
ENDIF()
|
||||
IF(NOT EXISTS "${_RTI_DIR}" OR NOT IS_DIRECTORY "${_RTI_DIR}")
|
||||
MESSAGE(FATAL_ERROR "Umgebungsvariable DDS_PATH nicht gesetzt!")
|
||||
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.")
|
||||
# mark as not available
|
||||
set(_RTI_DIR_NOT_FOUND TRUE)
|
||||
set(_RTI_DIR "")
|
||||
ENDIF()
|
||||
SET(_rti_gcc_arch "x64Linux3gcc4.8.2")
|
||||
IF("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
|
||||
IF(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 5.0.0)
|
||||
@@ -92,14 +95,21 @@ ELSE()
|
||||
ENDIF()
|
||||
|
||||
|
||||
IF(NOT RTI_INCLUDE_DIR)
|
||||
FIND_PATH(RTI_INCLUDE_DIR ndds/ndds_cpp.h HINTS ${_rti_include_hint})
|
||||
IF(RTI_INCLUDE_DIR)
|
||||
SET(RTI_INCLUDE_DIRS "${RTI_INCLUDE_DIR}" "${RTI_INCLUDE_DIR}/ndds" "${RTI_INCLUDE_DIR}/ndds/hpp" CACHE STRING "RTI include directories" FORCE)
|
||||
MARK_AS_ADVANCED(RTI_INCLUDE_DIRS)
|
||||
ELSE()
|
||||
MESSAGE(FATAL "Could not find RTI include directory at ${_rti_include_hint}")
|
||||
ENDIF()
|
||||
IF(NOT RTI_INCLUDE_DIR)
|
||||
if(DEFINED _RTI_DIR_NOT_FOUND AND _RTI_DIR STREQUAL "")
|
||||
# RTI directory was not found earlier; skip searching for includes and create empty placeholder
|
||||
message(WARNING "Skipping RTI include search because RTI installation was not found")
|
||||
set(RTI_INCLUDE_DIR "")
|
||||
set(RTI_INCLUDE_DIRS "" CACHE STRING "RTI include directories" FORCE)
|
||||
else()
|
||||
FIND_PATH(RTI_INCLUDE_DIR ndds/ndds_cpp.h HINTS ${_rti_include_hint})
|
||||
IF(RTI_INCLUDE_DIR)
|
||||
SET(RTI_INCLUDE_DIRS "${RTI_INCLUDE_DIR}" "${RTI_INCLUDE_DIR}/ndds" "${RTI_INCLUDE_DIR}/ndds/hpp" CACHE STRING "RTI include directories" FORCE)
|
||||
MARK_AS_ADVANCED(RTI_INCLUDE_DIRS)
|
||||
ELSE()
|
||||
MESSAGE(FATAL "Could not find RTI include directory at ${_rti_include_hint}")
|
||||
ENDIF()
|
||||
endif()
|
||||
ENDIF()
|
||||
|
||||
|
||||
|
||||
Reference in new issue
Block a user