force use of 3rdparty/Fast-CDR

facontidavide · Apr 25, 2024 · 3cea8ee · 3cea8ee
1 parent e659ad0
commit 3cea8ee
Showing 1 changed file with 3 additions and 12 deletions.
diff --git a/plotjuggler_plugins/ParserROS/rosx_introspection/CMakeLists.txt b/plotjuggler_plugins/ParserROS/rosx_introspection/CMakeLists.txt
@@ -9,16 +9,7 @@ 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()
+add_subdirectory(3rdparty/Fast-CDR)
 
 ###############################################
 ## Declare a C++ library
@@ -32,9 +23,9 @@ add_library(rosx_introspection STATIC
     src/ros_parser.cpp
     src/deserializer.cpp
     )
-target_link_libraries(rosx_introspection
-    fastcdr )
+target_link_libraries(rosx_introspection fastcdr )
 
 target_include_directories(rosx_introspection PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/Fast-CDR/include>
     )