From df51c4f0ca90443838341b69e74ec88935fa5021 Mon Sep 17 00:00:00 2001
From: Juan Luis Jimenez Simon <juan@rti.com>
Date: Fri, 9 Aug 2024 10:40:46 +0200
Subject: [PATCH] ROUTING-1234: adding support for new rtiserviceadmincpp
 library in FindConnextDDS (#122)

---
 cmake/Modules/FindRTIConnextDDS.cmake | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/cmake/Modules/FindRTIConnextDDS.cmake b/cmake/Modules/FindRTIConnextDDS.cmake
index cbb485c..730fe34 100644
--- a/cmake/Modules/FindRTIConnextDDS.cmake
+++ b/cmake/Modules/FindRTIConnextDDS.cmake
@@ -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")
@@ -1719,6 +1730,7 @@ if(routing_service IN_LIST RTIConnextDDS_FIND_COMPONENTS
     set(routing_service_libs
         "rtiroutingservice"
         "rtirsinfrastructure"
+        "rtiserviceadmincpp"
         ${addon_dependencies}
         "rticonnextmsgc"
         "nddsc"
@@ -1968,6 +1980,7 @@ if(recording_service IN_LIST RTIConnextDDS_FIND_COMPONENTS)
     list(APPEND recording_service_libs
         "rtiroutingservice"
         "rtirsinfrastructure"
+        "rtiserviceadmincpp"
         "nddscpp2"
         "rtidlc"
         "nddsmetp"
@@ -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)