Adds immediate migration results
This commit is contained in:
2395 files changed
+357322
-2524
No files matched your search
@@ -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})
|
||||
|
||||
|
||||
Reference in new issue
Block a user