BUILD_RTI conditional fixes and Qt6 API updates
- cmake/FindRTI.cmake: Add INTERFACE placeholder targets when RTI not found - cmake/FindRTI.cmake: Force BUILD_RTI=OFF when RTI not installed - Lts/Common/LtsSession/CMakeLists.txt: Make LtsSessionDataDds conditional on BUILD_RTI - Lts/Viewer/CMakeLists.txt: Make LtsDataView conditional on BUILD_RTI - Lts/Plugins/*/CMakeLists.txt: 97 plugin files wrapped in BUILD_RTI conditionals - cmake/NGLMacros.cmake: Fix NGL_ADD_BIG_RESOURCES macro (removed premature return()) - Multiple Qt6 API fixes: QLinkedList→std::list, QStringRef→QStringView, etc. - BUILD_RTI_FIXES_SUMMARY.md: Comprehensive documentation of all fixes Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
2065 files changed
+48219
-1763
No files matched your search
@@ -590,15 +590,15 @@ MACRO(NGL_ADD_BIG_RESOURCES)
|
||||
# Qt6 path: use qt6_add_resources
|
||||
if(TARGET Qt6::Core)
|
||||
qt6_add_resources(${ARGN})
|
||||
return()
|
||||
# Note: Removed return() as it exits the calling CMakeLists.txt file
|
||||
else()
|
||||
GET_PROPERTY(ipo_active VARIABLE PROPERTY CMAKE_INTERPROCEDURAL_OPTIMIZATION)
|
||||
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})
|
||||
ENDIF()
|
||||
endif()
|
||||
|
||||
GET_PROPERTY(ipo_active VARIABLE PROPERTY CMAKE_INTERPROCEDURAL_OPTIMIZATION)
|
||||
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})
|
||||
ENDIF()
|
||||
ENDMACRO()
|
||||
|
||||
|
||||
|
||||
Reference in new issue
Block a user