Adds immediate migration results
This commit is contained in:
2395 files changed
+357322
-2524
No files matched your search
@@ -4,21 +4,29 @@
|
||||
# $Author$
|
||||
#
|
||||
|
||||
ADD_SUBDIRECTORY(DDSConnector)
|
||||
IF(BUILD_RTI)
|
||||
ADD_SUBDIRECTORY(DDSConnector)
|
||||
ENDIF()
|
||||
|
||||
ADD_SUBDIRECTORY(DTC)
|
||||
ADD_SUBDIRECTORY(DTS)
|
||||
ADD_SUBDIRECTORY(FTC)
|
||||
IF(BUILD_RTI)
|
||||
ADD_SUBDIRECTORY(FTC)
|
||||
ENDIF()
|
||||
ADD_SUBDIRECTORY(FTS)
|
||||
ADD_SUBDIRECTORY(Generic)
|
||||
ADD_SUBDIRECTORY(Routing)
|
||||
|
||||
ADD_SUBDIRECTORY(Core)
|
||||
ADD_SUBDIRECTORY(QosProfile)
|
||||
IF(BUILD_RTI)
|
||||
ADD_SUBDIRECTORY(QosProfile)
|
||||
ENDIF()
|
||||
|
||||
# During stepwise migration, add placeholder CTest entries before the
|
||||
# real DdsUnitTests subdir so the test-suite shows migration status even
|
||||
# when internal codegen targets are not yet available.
|
||||
ADD_SUBDIRECTORY(DdsUnitTestsPlaceholder)
|
||||
|
||||
ADD_SUBDIRECTORY(DdsUnitTests)
|
||||
IF(BUILD_RTI)
|
||||
ADD_SUBDIRECTORY(DdsUnitTests)
|
||||
ENDIF()
|
||||
@@ -4,6 +4,8 @@
|
||||
# $Author$
|
||||
#
|
||||
|
||||
IF(BUILD_RTI)
|
||||
|
||||
INCLUDE(MacroRTIDDSGen)
|
||||
INCLUDE(MacroCodeGenIdl)
|
||||
|
||||
@@ -42,7 +44,7 @@ NGL_TARGET_LINK_LIBRARIES(ddscore
|
||||
PUBLIC
|
||||
LtsUtilsCoreHeaderOnly
|
||||
ddsdts
|
||||
Qt5::Core
|
||||
Qt6::Core
|
||||
RTI::nddsc # DDS_GroupDataQosPolicy_initialize (wo auch immer das herkommt)
|
||||
RTI::nddscore # RTI_LOG_ANY_FAILURE_s (wo auch immer das herkommt)
|
||||
RTI::nddscpp2
|
||||
@@ -95,3 +97,5 @@ NGL_INSTALL_TARGET(svcCoreClient)
|
||||
# --- Topic Type Plugin --------------------------------------------------------------
|
||||
#
|
||||
CREATE_TOPIC_TYPE_PLUGIN(${xml_FILE})
|
||||
|
||||
ENDIF(BUILD_RTI)
|
||||
@@ -21,6 +21,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(
|
||||
INTERFACE
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../../
|
||||
)
|
||||
IF(BUILD_RTI)
|
||||
NGL_TARGET_LINK_LIBRARIES(ddsconnector
|
||||
PRIVATE
|
||||
NGLLogger
|
||||
@@ -32,5 +33,17 @@ NGL_TARGET_LINK_LIBRARIES(ddsconnector
|
||||
ddsdtc
|
||||
ddsdts
|
||||
ProjectConfig
|
||||
Qt5::Core
|
||||
Qt6::Core
|
||||
)
|
||||
ELSE()
|
||||
NGL_TARGET_LINK_LIBRARIES(ddsconnector
|
||||
PRIVATE
|
||||
NGLLogger
|
||||
PUBLIC
|
||||
ddsQoS
|
||||
ddsdtc
|
||||
ddsdts
|
||||
ProjectConfig
|
||||
Qt6::Core
|
||||
)
|
||||
ENDIF()
|
||||
@@ -11,7 +11,7 @@ TARGET_INCLUDE_DIRECTORIES(ddsdtc
|
||||
)
|
||||
TARGET_LINK_LIBRARIES(ddsdtc
|
||||
INTERFACE
|
||||
Qt5::Core
|
||||
Qt6::Core
|
||||
ddsgen
|
||||
NGLLogger
|
||||
LtsUtilsCoreHeaderOnly
|
||||
|
||||
@@ -11,7 +11,7 @@ TARGET_INCLUDE_DIRECTORIES(ddsdts
|
||||
)
|
||||
TARGET_LINK_LIBRARIES(ddsdts
|
||||
INTERFACE
|
||||
Qt5::Core
|
||||
Qt6::Core
|
||||
ddsgen
|
||||
NGLLogger
|
||||
)
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
# $Author$
|
||||
#
|
||||
|
||||
IF(BUILD_TESTING AND TARGET ddsgen AND TARGET ddsdtc AND TARGET ddsfts AND TARGET ddsQoS)
|
||||
IF(BUILD_TESTING AND BUILD_RTI AND TARGET ddsgen AND TARGET ddsdtc AND TARGET ddsfts AND TARGET ddsQoS)
|
||||
|
||||
SET(xml_FILE ddsut.xml)
|
||||
|
||||
@@ -27,7 +27,7 @@ NGL_TARGET_LINK_LIBRARIES(ddsut_common
|
||||
NGLLogger
|
||||
PUBLIC
|
||||
LtsUtilsCoreHeaderOnly
|
||||
Qt5::Core
|
||||
Qt6::Core
|
||||
RTI::nddsc
|
||||
RTI::nddscore
|
||||
RTI::nddscpp2
|
||||
@@ -77,8 +77,8 @@ TARGET_LINK_LIBRARIES(ddsGenericDataTests
|
||||
nglcoreapplication
|
||||
NGLLogger
|
||||
ProjectConfig
|
||||
Qt5::Core
|
||||
Qt5::Test
|
||||
Qt6::Core
|
||||
Qt6::Test
|
||||
ddsut_common
|
||||
)
|
||||
ADD_TEST(NAME ddsGenericDataTests COMMAND $<TARGET_FILE:ddsGenericDataTests>)
|
||||
@@ -94,8 +94,8 @@ TARGET_LINK_LIBRARIES(ddsDataTopicTests
|
||||
ddsdtc
|
||||
ddsQoS
|
||||
ProjectConfig
|
||||
Qt5::Core
|
||||
Qt5::Test
|
||||
Qt6::Core
|
||||
Qt6::Test
|
||||
ddsut_common
|
||||
)
|
||||
ADD_TEST(NAME ddsDataTopicTests COMMAND $<TARGET_FILE:ddsDataTopicTests>)
|
||||
@@ -111,8 +111,8 @@ TARGET_LINK_LIBRARIES(ddsFunctionTopicTests
|
||||
nglcoreapplication
|
||||
NGLLogger
|
||||
ngltools
|
||||
Qt5::Core
|
||||
Qt5::Test
|
||||
Qt6::Core
|
||||
Qt6::Test
|
||||
ddsut_common
|
||||
)
|
||||
ADD_TEST(NAME ddsFunctionTopicTests COMMAND $<TARGET_FILE:ddsFunctionTopicTests>)
|
||||
|
||||
@@ -23,21 +23,21 @@ if(BUILD_TESTING)
|
||||
# Generic data tests smoke (QtTest)
|
||||
if(BUILD_SMOKE_TESTS OR NOT TARGET ddsGenericDataTests)
|
||||
add_executable(ddsGenericDataTests_smoke ddsGenericDataTests_smoke.cpp mocks/MockDDS.cpp)
|
||||
target_link_libraries(ddsGenericDataTests_smoke PRIVATE Qt5::Core Qt5::Test)
|
||||
target_link_libraries(ddsGenericDataTests_smoke PRIVATE Qt6::Core Qt6::Test)
|
||||
add_test(NAME ddsGenericDataTests COMMAND $<TARGET_FILE:ddsGenericDataTests_smoke>)
|
||||
endif()
|
||||
|
||||
# Data topic tests smoke (QtTest)
|
||||
if(BUILD_SMOKE_TESTS OR NOT TARGET ddsDataTopicTests)
|
||||
add_executable(ddsDataTopicTests_smoke ddsDataTopicTests_smoke.cpp mocks/MockDDS.cpp)
|
||||
target_link_libraries(ddsDataTopicTests_smoke PRIVATE Qt5::Core Qt5::Test)
|
||||
target_link_libraries(ddsDataTopicTests_smoke PRIVATE Qt6::Core Qt6::Test)
|
||||
add_test(NAME ddsDataTopicTests COMMAND $<TARGET_FILE:ddsDataTopicTests_smoke>)
|
||||
endif()
|
||||
|
||||
# Function topic tests smoke (QtTest)
|
||||
if(BUILD_SMOKE_TESTS OR NOT TARGET ddsFunctionTopicTests)
|
||||
add_executable(ddsFunctionTopicTests_smoke ddsFunctionTopicTests_smoke.cpp mocks/MockDDS.cpp)
|
||||
target_link_libraries(ddsFunctionTopicTests_smoke PRIVATE Qt5::Core Qt5::Test)
|
||||
target_link_libraries(ddsFunctionTopicTests_smoke PRIVATE Qt6::Core Qt6::Test)
|
||||
add_test(NAME ddsFunctionTopicTests COMMAND $<TARGET_FILE:ddsFunctionTopicTests_smoke>)
|
||||
endif()
|
||||
|
||||
|
||||
@@ -11,9 +11,10 @@ TARGET_INCLUDE_DIRECTORIES(ddsftc
|
||||
INTERFACE
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../../
|
||||
)
|
||||
IF(BUILD_RTI)
|
||||
TARGET_LINK_LIBRARIES(ddsftc
|
||||
INTERFACE
|
||||
Qt5::Core
|
||||
Qt6::Core
|
||||
ddsfts_connext
|
||||
ddscore # due to the usage of Core::FtReplyState inside generic_ftc_impl.h, only on core.hpp - fixme :/
|
||||
ddsgen
|
||||
@@ -23,6 +24,17 @@ TARGET_LINK_LIBRARIES(ddsftc
|
||||
ddsftccore
|
||||
LtsUtilsCoreHeaderOnly
|
||||
)
|
||||
ELSE()
|
||||
TARGET_LINK_LIBRARIES(ddsftc
|
||||
INTERFACE
|
||||
Qt6::Core
|
||||
ddscore
|
||||
ddsgen
|
||||
ddsQoS
|
||||
ddsftccore
|
||||
LtsUtilsCoreHeaderOnly
|
||||
)
|
||||
ENDIF()
|
||||
SET(SRCS
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/generic_ftc.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/generic_ftc.cpp
|
||||
@@ -42,7 +54,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(ddsftccore
|
||||
)
|
||||
NGL_TARGET_LINK_LIBRARIES(ddsftccore
|
||||
PUBLIC
|
||||
Qt5::Core
|
||||
Qt6::Core
|
||||
ddscore
|
||||
)
|
||||
NGL_INSTALL_TARGET(ddsftccore)
|
||||
@@ -4,6 +4,7 @@
|
||||
# $Author$
|
||||
#
|
||||
|
||||
IF(BUILD_RTI)
|
||||
ADD_LIBRARY(ddsfts_connext INTERFACE)
|
||||
TARGET_INCLUDE_DIRECTORIES(ddsfts_connext
|
||||
INTERFACE
|
||||
@@ -17,7 +18,7 @@ SET(SRCS
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/connext.h
|
||||
)
|
||||
TARGET_SOURCES(ddsfts_connext INTERFACE ${SRCS})
|
||||
|
||||
ENDIF()
|
||||
|
||||
SET(SRCS
|
||||
generic_fts.h ;# Interface
|
||||
@@ -31,15 +32,26 @@ NGL_TARGET_INCLUDE_DIRECTORIES(
|
||||
INTERFACE
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../../
|
||||
)
|
||||
IF(BUILD_RTI)
|
||||
NGL_TARGET_LINK_LIBRARIES(ddsfts
|
||||
PRIVATE
|
||||
RTI::nddscore
|
||||
ProjectConfig
|
||||
ddsQoS
|
||||
PUBLIC
|
||||
Qt5::Core
|
||||
Qt6::Core
|
||||
RTI::nddsc
|
||||
RTI::nddscpp2
|
||||
ddsgen
|
||||
ddsfts_connext
|
||||
)
|
||||
ELSE()
|
||||
NGL_TARGET_LINK_LIBRARIES(ddsfts
|
||||
PRIVATE
|
||||
ProjectConfig
|
||||
ddsQoS
|
||||
PUBLIC
|
||||
Qt6::Core
|
||||
ddsgen
|
||||
)
|
||||
ENDIF()
|
||||
@@ -4,6 +4,8 @@
|
||||
# $Author$
|
||||
#
|
||||
|
||||
IF(BUILD_RTI)
|
||||
|
||||
FIND_PACKAGE(Threads REQUIRED)
|
||||
|
||||
SET(ddsgen_SRCS
|
||||
@@ -30,7 +32,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(ddsgen
|
||||
NGL_TARGET_LINK_LIBRARIES(ddsgen
|
||||
PUBLIC
|
||||
${CMAKE_THREAD_LIBS_INIT}
|
||||
Qt5::Core
|
||||
Qt6::Core
|
||||
RTI::nddscpp2
|
||||
NGLLogger
|
||||
LtsUtilsCoreHeaderOnly
|
||||
@@ -40,4 +42,6 @@ NGL_TARGET_LINK_LIBRARIES(ddsgen
|
||||
ADD_LIBRARY(topic_type_plugin INTERFACE)
|
||||
TARGET_SOURCES(topic_type_plugin INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/topic_type_plugin.h)
|
||||
TARGET_INCLUDE_DIRECTORIES(topic_type_plugin INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/../../)
|
||||
TARGET_LINK_LIBRARIES(topic_type_plugin INTERFACE ddsgen Qt5::Core)
|
||||
TARGET_LINK_LIBRARIES(topic_type_plugin INTERFACE ddsgen Qt6::Core)
|
||||
|
||||
ENDIF(BUILD_RTI)
|
||||
@@ -4,6 +4,8 @@
|
||||
# $Author$
|
||||
#
|
||||
|
||||
IF(BUILD_RTI)
|
||||
|
||||
SET(SRCS
|
||||
DDS_DefaultQos.h
|
||||
DDS_DefaultQos.cpp
|
||||
@@ -31,5 +33,7 @@ NGL_TARGET_LINK_LIBRARIES(ddsQoS
|
||||
NGLLogger
|
||||
ngltools
|
||||
PUBLIC
|
||||
Qt5::Core
|
||||
Qt6::Core
|
||||
)
|
||||
|
||||
ENDIF(BUILD_RTI)
|
||||
Reference in new issue
Block a user