Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ROUTING-1234: adding support for new rtiserviceadmincpp library in Fi… #122

Merged
merged 1 commit into from
Aug 9, 2024
Merged

ROUTING-1234: adding support for new rtiserviceadmincpp library in Fi… #122

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions cmake/Modules/FindRTIConnextDDS.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1698,6 +1698,17 @@ if(routing_service IN_LIST RTIConnextDDS_FIND_COMPONENTS
"ROUTING_SERVICE_INFRASTRUCTURE"
)

set(rtiserviceadmincpp_libs
"rtiserviceadmincpp"
"nddscpp2"
"nddsc"
"nddscore"
)
get_all_library_variables(
"${rtiserviceadmincpp_libs}"
"ROUTING_SERVICE_ADMIN"
)

set(addon_dependencies)
if(METP_LIBRARIES)
list(APPEND addon_dependencies "nddsmetp")
Expand All @@ -1719,6 +1730,7 @@ if(routing_service IN_LIST RTIConnextDDS_FIND_COMPONENTS
set(routing_service_libs
"rtiroutingservice"
"rtirsinfrastructure"
"rtiserviceadmincpp"
${addon_dependencies}
"rticonnextmsgc"
"nddsc"
Expand Down Expand Up @@ -1968,6 +1980,7 @@ if(recording_service IN_LIST RTIConnextDDS_FIND_COMPONENTS)
list(APPEND recording_service_libs
"rtiroutingservice"
"rtirsinfrastructure"
"rtiserviceadmincpp"
"nddscpp2"
"rtidlc"
"nddsmetp"
Expand Down Expand Up @@ -2518,6 +2531,13 @@ if(RTIConnextDDS_FOUND)
RTIConnextDDS::c_api
)

create_connext_imported_target(
TARGET "service_admin_cpp2"
VAR "ROUTING_SERVICE_ADMIN"
DEPENDENCIES
RTIConnextDDS::cpp2_api
)

# Routing Service C API
set(dependencies RTIConnextDDS::routing_service_infrastructure)

Expand Down