Moved back fastCDR 3rdparty

If this commit is applied then fastCDR library will be build in original CMakeLists.txt file i.e ./rosx_introspection. Done that as it is a change requested in pull request. Issue: [facontidavide#919] Co-authored-by: ManuelValch <[email protected]>
manuelValch · Feb 14, 2024 · 0bc4393 · 0bc4393
1 parent 4e78ee9
commit 0bc4393
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/plotjuggler_plugins/ParserROS/CMakeLists.txt b/plotjuggler_plugins/ParserROS/CMakeLists.txt
@@ -7,17 +7,6 @@ SET(INTROSPECTION_TESTS OFF CACHE BOOL "Compile the tests")
 # Check if default fastCdr library generation is needed
 find_package(fastcdr QUIET)
 
-if(NOT fastcdr_FOUND )
-    message(STATUS "[FastCdr] not found, create shared libraries")
-    # Override Fast-CDR option: compile as static lib
-    SET(BUILD_SHARED_LIBS OFF CACHE BOOL "Create shared libraries by default")
-    add_subdirectory(rosx_introspection/3rdparty/Fast-CDR)
-    include_directories(rosx_introspection/3rdparty/Fast-CDR/include)
-else()
-    # Mention that FastCdr has been found on system
-    message(STATUS "[FastCdr] found, version: ${fastcdr_VERSION}")
-endif()
-
 add_subdirectory(rosx_introspection)
 
 include_directories( rosx_introspection/include )

diff --git a/plotjuggler_plugins/ParserROS/rosx_introspection/CMakeLists.txt b/plotjuggler_plugins/ParserROS/rosx_introspection/CMakeLists.txt
@@ -9,6 +9,17 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
+if(NOT fastcdr_FOUND )
+    message(STATUS "[FastCdr] not found, create shared libraries")
+    # Override Fast-CDR option: compile as static lib
+    SET(BUILD_SHARED_LIBS OFF CACHE BOOL "Create shared libraries by default")
+    add_subdirectory(3rdparty/Fast-CDR)
+    include_directories(3rdparty/Fast-CDR/include)
+else()
+    # Mention that FastCdr has been found on system
+    message(STATUS "[FastCdr] found, version: ${fastcdr_VERSION}")
+endif()
+
 ###############################################
 ## Declare a C++ library
 ###############################################