Migration of Legatus codebase to Qt6 with RTI Connext DDS 7.7 integration is partially complete. Core DDS targets build successfully, but ProjectDataManagement module blocks full ddsfts compilation due to IDL definition conflicts.
This commit is contained in:
256 files changed
+1170
-610
No files matched your search
@@ -6,6 +6,8 @@
|
||||
# Created by Mike Wille, SLSE, 2016-10-10
|
||||
#
|
||||
|
||||
set(CMAKE_AUTOMOC ON)
|
||||
|
||||
SET(ProjectAhtcPlugin_SRCS
|
||||
main.h
|
||||
main.cpp
|
||||
@@ -13,9 +15,16 @@ SET(ProjectAhtcPlugin_SRCS
|
||||
./resources/apps.json
|
||||
)
|
||||
|
||||
# Add include path for PluginInterfaces for both compilation and AUTOMOC
|
||||
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/Lts/Common)
|
||||
|
||||
NGL_ADD_BIG_RESOURCES(ProjectAhtcPlugin_SRCS ahtc_resources.qrc)
|
||||
NGL_ADD_LIBRARY(WS ProjectAhtcPlugin MODULE ${ProjectAhtcPlugin_SRCS})
|
||||
|
||||
# Add include path for PluginInterfaces for both compilation and AUTOMOC
|
||||
TARGET_INCLUDE_DIRECTORIES(ProjectAhtcPlugin PRIVATE ${CMAKE_SOURCE_DIR}/Lts/Common)
|
||||
set_target_properties(ProjectAhtcPlugin PROPERTIES AUTOMOC_INCLUDE_DIRECTORIES "${CMAKE_SOURCE_DIR}/Lts/Common")
|
||||
|
||||
NGL_TARGET_LINK_LIBRARIES(ProjectAhtcPlugin
|
||||
PUBLIC
|
||||
Qt6::Core
|
||||
|
||||
@@ -3,9 +3,11 @@
|
||||
# $HeadURL$
|
||||
# $Author$
|
||||
#
|
||||
# Created by Mike Wille, SLSE, 2016-11-25
|
||||
# Created by Mike Wille, SLSE, 2016-10-10
|
||||
#
|
||||
|
||||
set(CMAKE_AUTOMOC ON)
|
||||
|
||||
SET(ProjectEtsPlugin_SRCS
|
||||
main.h
|
||||
main.cpp
|
||||
@@ -13,9 +15,16 @@ SET(ProjectEtsPlugin_SRCS
|
||||
./resources/apps.json
|
||||
)
|
||||
|
||||
# Add include path for PluginInterfaces for both compilation and AUTOMOC
|
||||
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/Lts/Common)
|
||||
|
||||
NGL_ADD_BIG_RESOURCES(ProjectEtsPlugin_SRCS ets_resources.qrc)
|
||||
NGL_ADD_LIBRARY(WS ProjectEtsPlugin MODULE ${ProjectEtsPlugin_SRCS})
|
||||
|
||||
# Add include path for PluginInterfaces for both compilation and AUTOMOC
|
||||
TARGET_INCLUDE_DIRECTORIES(ProjectEtsPlugin PRIVATE ${CMAKE_SOURCE_DIR}/Lts/Common)
|
||||
set_target_properties(ProjectEtsPlugin PROPERTIES AUTOMOC_INCLUDE_DIRECTORIES "${CMAKE_SOURCE_DIR}/Lts/Common")
|
||||
|
||||
NGL_TARGET_LINK_LIBRARIES(ProjectEtsPlugin
|
||||
PUBLIC
|
||||
Qt6::Core
|
||||
|
||||
@@ -6,6 +6,8 @@
|
||||
# Created by Mike Wille, SLSE, 2016-10-10
|
||||
#
|
||||
|
||||
set(CMAKE_AUTOMOC ON)
|
||||
|
||||
SET(ProjectL400P2Plugin_SRCS
|
||||
main.h
|
||||
main.cpp
|
||||
@@ -13,9 +15,16 @@ SET(ProjectL400P2Plugin_SRCS
|
||||
./resources/apps.json
|
||||
)
|
||||
|
||||
# Add include path for PluginInterfaces for both compilation and AUTOMOC
|
||||
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/Lts/Common)
|
||||
|
||||
NGL_ADD_BIG_RESOURCES(ProjectL400P2Plugin_SRCS l400p2_resources.qrc)
|
||||
NGL_ADD_LIBRARY(WS ProjectL400P2Plugin MODULE ${ProjectL400P2Plugin_SRCS})
|
||||
|
||||
# Add include path for PluginInterfaces for both compilation and AUTOMOC
|
||||
TARGET_INCLUDE_DIRECTORIES(ProjectL400P2Plugin PRIVATE ${CMAKE_SOURCE_DIR}/Lts/Common)
|
||||
set_target_properties(ProjectL400P2Plugin PROPERTIES AUTOMOC_INCLUDE_DIRECTORIES "${CMAKE_SOURCE_DIR}/Lts/Common")
|
||||
|
||||
NGL_TARGET_LINK_LIBRARIES(ProjectL400P2Plugin
|
||||
PUBLIC
|
||||
Qt6::Core
|
||||
|
||||
@@ -6,6 +6,8 @@
|
||||
# Created by Mike Wille, SLSE, 2016-10-10
|
||||
#
|
||||
|
||||
set(CMAKE_AUTOMOC ON)
|
||||
|
||||
SET(ProjectQatarPlugin_SRCS
|
||||
main.h
|
||||
main.cpp
|
||||
@@ -13,9 +15,16 @@ SET(ProjectQatarPlugin_SRCS
|
||||
./resources/apps.json
|
||||
)
|
||||
|
||||
# Add include path for PluginInterfaces for both compilation and AUTOMOC
|
||||
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/Lts/Common)
|
||||
|
||||
NGL_ADD_BIG_RESOURCES(ProjectQatarPlugin_SRCS qatar_resources.qrc)
|
||||
NGL_ADD_LIBRARY(WS ProjectQatarPlugin MODULE ${ProjectQatarPlugin_SRCS})
|
||||
|
||||
# Add include path for PluginInterfaces for both compilation and AUTOMOC
|
||||
TARGET_INCLUDE_DIRECTORIES(ProjectQatarPlugin PRIVATE ${CMAKE_SOURCE_DIR}/Lts/Common)
|
||||
set_target_properties(ProjectQatarPlugin PROPERTIES AUTOMOC_INCLUDE_DIRECTORIES "${CMAKE_SOURCE_DIR}/Lts/Common")
|
||||
|
||||
NGL_TARGET_LINK_LIBRARIES(ProjectQatarPlugin
|
||||
PUBLIC
|
||||
Qt6::Core
|
||||
|
||||
Reference in new issue
Block a user