Add flag for using sytem Fast-CDR (#256)

* Add flag for using sytem Fast-CDR * Update colcon.pkg
eProsima · Jun 30, 2021 · bf6dc25 · bf6dc25
1 parent 30d0e57
commit bf6dc25
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -28,6 +28,7 @@ option(UAGENT_USE_INTERNAL_GTEST "Enable internal GTest libraries." OFF)
 option(BUILD_SHARED_LIBS "Control shared/static building." ON)
 
 option(UAGENT_USE_SYSTEM_FASTDDS "Force find and use system installed Fast-DDS." OFF)
+option(UAGENT_USE_SYSTEM_FASTCDR "Force find and use system installed Fast-CDR." OFF)
 option(UAGENT_FAST_PROFILE "Build FastMiddleware profile." ON)
 option(UAGENT_CED_PROFILE "Build CedMiddleware profile." ON)
 option(UAGENT_DISCOVERY_PROFILE "Build Discovery profile." ON)
@@ -70,7 +71,7 @@ option(UAGENT_TWEAK_XRCE_WRITE_LIMIT "This feature uses a tweak to allow XRCE WR
 ###############################################################################
 set(_deps "")
 
-if(UAGENT_USE_SYSTEM_FASTDDS)
+if(UAGENT_USE_SYSTEM_FASTCDR)
     set(_fastcdr_version 1)
 else()
     set(_fastcdr_version 1.0.13)

diff --git a/cmake/SuperBuild.cmake b/cmake/SuperBuild.cmake
@@ -49,7 +49,7 @@ if(UAGENT_P2P_PROFILE)
 endif()
 
 # Fast CDR.
-if(NOT UAGENT_USE_SYSTEM_FASTDDS)
+if(NOT UAGENT_USE_SYSTEM_FASTCDR)
     unset(fastcdr_DIR CACHE)
     find_package(fastcdr ${_fastcdr_version} EXACT QUIET)
     if(NOT fastcdr_FOUND)

diff --git a/colcon.pkg b/colcon.pkg
@@ -7,6 +7,7 @@
     ],
     "cmake-args":[
         "-DUAGENT_ISOLATED_INSTALL=OFF",
+        "-DUAGENT_USE_SYSTEM_FASTCDR=ON",
         "-DUAGENT_USE_SYSTEM_FASTDDS=ON"
     ]
-}
+}