Qt6 Migration: BUILD_RTI guards und CMake fixes
- BUILD_RTI conditional compilation für RTI Connext DDS dependencies - Namespace fixes in core_dtc.h (Core:: → DDS::Core::) - CMakeLists.txt: BUILD_RTI option und conditional dependencies - Handler minelayer: namespace closing mit BUILD_RTI guard - Build erfolgreich mit BUILD_RTI=OFF validiert Signed-off-by: Torsten Wierschin <torsten.wierschin@life-maps.com>
This commit is contained in:
422 files changed
+1013
-599
No files matched your search
@@ -45,12 +45,24 @@ SET(timeline_UICS
|
||||
|
||||
NGL_WRAP_UI(timeline_SRCS ${timeline_UICS})
|
||||
|
||||
IF(BUILD_RTI)
|
||||
NGL_ADD_LIBRARY2(WS LtsTimelineClassic SHARED ${timeline_SRCS} ${timeline_UICS})
|
||||
|
||||
# Qt6 AutoUic configuration for UI files in Ui/ subdirectory
|
||||
set_target_properties(LtsTimelineClassic PROPERTIES
|
||||
AUTOUIC ON
|
||||
AUTOUIC_SEARCH_PATHS "${CMAKE_CURRENT_SOURCE_DIR}/Ui"
|
||||
)
|
||||
|
||||
# Generate export header for shared library
|
||||
include(GenerateExportHeader)
|
||||
generate_export_header(LtsTimelineClassic
|
||||
EXPORT_FILE_NAME "${CMAKE_CURRENT_BINARY_DIR}/ltstimelineclassic_export.h"
|
||||
)
|
||||
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(LtsTimelineClassic
|
||||
PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../
|
||||
${CMAKE_CURRENT_BINARY_DIR}
|
||||
)
|
||||
|
||||
NGL_TARGET_LINK_LIBRARIES(LtsTimelineClassic
|
||||
@@ -64,21 +76,4 @@ NGL_TARGET_LINK_LIBRARIES(LtsTimelineClassic
|
||||
)
|
||||
|
||||
|
||||
IF(NEVER)
|
||||
NGL_ADD_EXECUTABLE(WS LtsTimelineClassicTest main.cpp)
|
||||
NGL_TARGET_LINK_LIBRARIES(LtsTimelineClassicTest
|
||||
nglapplication
|
||||
NGLLogger
|
||||
Qt6::Core
|
||||
Qt6::Gui
|
||||
Qt6::Widgets
|
||||
LtsTimelineClassic
|
||||
svcEemCommon
|
||||
svcEemClient
|
||||
PdmDataPluginInterface
|
||||
)
|
||||
ENDIF()
|
||||
|
||||
NGL_INSTALL_TARGET(LtsTimelineClassic)
|
||||
ENDIF(BUILD_RTI)
|
||||
|
||||
Reference in new issue
Block a user