cmake files moved

facontidavide · Feb 8, 2024 · 2d2a5dd · 2d2a5dd
1 parent fbb9d1c
commit 2d2a5dd
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 99 deletions.
diff --git a/...gins/DataStreamZMQ/cmake/FindZeroMQ.cmake → cmake/FindZeroMQ.cmake b/...gins/DataStreamZMQ/cmake/FindZeroMQ.cmake → cmake/FindZeroMQ.cmake
diff --git a/...plugins/DataLoadMCAP/cmake/FindZstd.cmake → cmake/FindZstd.cmake b/...plugins/DataLoadMCAP/cmake/FindZstd.cmake → cmake/FindZstd.cmake
diff --git a/plotjuggler_plugins/DataLoadMCAP/CMakeLists.txt b/plotjuggler_plugins/DataLoadMCAP/CMakeLists.txt
@@ -1,43 +1,33 @@
-
 if(BUILDING_WITH_CONAN)
-
     find_package(zstd CONFIG REQUIRED)
     set(Zstd_LIBRARIES zstd::libzstd_static)
     set(Zstd_FOUND ON)
-
 else()
-
-    list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/")
-    find_package(Zstd QUIET)
-
+    find_package(Zstd REQUIRED)
 endif()
 ###########################################
 
-if(Zstd_FOUND)
-
-    include_directories( ${Zstd_INCLUDE_DIRS} )
+add_definitions(${QT_DEFINITIONS})
+add_definitions(-DQT_PLUGIN)
 
-    add_definitions(${QT_DEFINITIONS})
-    add_definitions(-DQT_PLUGIN)
+QT5_WRAP_UI ( UI_SRC  dialog_mcap.ui  )
 
-    QT5_WRAP_UI ( UI_SRC  dialog_mcap.ui  )
+SET( SRC
+    mcap.cpp
+    dataload_mcap.cpp
+    dialog_mcap.cpp
+)
 
-    SET( SRC
-        mcap.cpp
-        dataload_mcap.cpp
-        dialog_mcap.cpp
-        )
+add_library(DataLoadMCAP SHARED ${SRC} ${UI_SRC}  )
+target_include_directories(DataLoadMCAP PRIVATE
+    $<BUILD_INTERFACE:${Zstd_INCLUDE_DIRS}> )
 
-    add_library(DataLoadMCAP SHARED ${SRC} ${UI_SRC}  )
-    target_link_libraries(DataLoadMCAP
-        ${Qt5Widgets_LIBRARIES}
-        ${Qt5Xml_LIBRARIES}
-        ${Zstd_LIBRARIES}
-        lz4_static
-        plotjuggler_base )
+target_link_libraries(DataLoadMCAP
+    ${Qt5Widgets_LIBRARIES}
+    ${Qt5Xml_LIBRARIES}
+    ${Zstd_LIBRARIES}
+    lz4_static
+    plotjuggler_base )
 
-    install(TARGETS DataLoadMCAP DESTINATION ${PJ_PLUGIN_INSTALL_DIRECTORY}  )
+install(TARGETS DataLoadMCAP DESTINATION ${PJ_PLUGIN_INSTALL_DIRECTORY}  )
 
-else()
-    message("MCAP dependencies (Zstd) not found")
-endif()
diff --git a/plotjuggler_plugins/DataLoadParquet/cmake/FindZstd.cmake b/plotjuggler_plugins/DataLoadParquet/cmake/FindZstd.cmake
diff --git a/plotjuggler_plugins/DataStreamZMQ/CMakeLists.txt b/plotjuggler_plugins/DataStreamZMQ/CMakeLists.txt
@@ -4,7 +4,6 @@ elseif(BUILDING_WITH_CONAN)
     message(STATUS "Finding ZeroMQ with conan")
 else()
     message(STATUS "Finding ZeroMQ without package managers")
-    list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/")
     set(ZeroMQ_LIBS ${ZeroMQ_LIBRARIES})
 endif()