export dependencies

fzi-forschungszentrum-informatik · Sep 13, 2023 · a8aaaf5 · a8aaaf5
1 parent a919157
commit a8aaaf5
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -99,7 +99,6 @@ At least **C++14** is required.
 Besides [Catkin](https://catkin-tools.readthedocs.io/en/latest/index.html), the dependencies are
 * `Boost` (from 1.58)
 * `eigen3`
-* [`mrt_cmake_modules`](https://github.com/KIT-MRT/mrt_cmake_modules), a CMake helper library
 * `pugixml` (for lanelet2_io)
 * `boost-python, python2 or python3` (for lanelet2_python)
 * `geographiclib` (for lanelet2_projection)

diff --git a/lanelet2_core/CMakeLists.txt b/lanelet2_core/CMakeLists.txt
@@ -31,8 +31,12 @@ target_include_directories(${PROJECT_NAME}
     "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
     "$<INSTALL_INTERFACE:include>")
 
+find_package(Boost REQUIRED COMPONENTS polygon)
 find_package(Eigen3 REQUIRED)
-target_link_libraries(${PROJECT_NAME} PUBLIC Eigen3::Eigen)
+target_link_libraries(${PROJECT_NAME} PUBLIC 
+  Eigen3::Eigen
+  Boost::polygon
+  )
 
 #############
 ## Install ##
@@ -71,4 +75,4 @@ if(BUILD_TESTING)
   endforeach()
 endif()
 
-ament_package()
+ament_package(CONFIG_EXTRAS "cmake/ConfigExtras.cmake")
diff --git a/lanelet2_core/cmake/ConfigExtras.cmake b/lanelet2_core/cmake/ConfigExtras.cmake
@@ -0,0 +1 @@
+find_package(Boost REQUIRED COMPONENTS polygon)
diff --git a/lanelet2_examples/CMakeLists.txt b/lanelet2_examples/CMakeLists.txt
@@ -31,7 +31,6 @@ find_package(lanelet2_traffic_rules  REQUIRED)
 foreach(SUBFOLDER IN LISTS SUBFOLDERS)
     if(IS_DIRECTORY ${SUBFOLDER})
         get_filename_component(SUBFOLDER_NAME ${SUBFOLDER} NAME)
-        message("Subfolder: ${SUBFOLDER_NAME}")
         add_executable(${SUBFOLDER_NAME}
             src/${SUBFOLDER_NAME}/main.cpp
         )

diff --git a/lanelet2_io/CMakeLists.txt b/lanelet2_io/CMakeLists.txt
@@ -59,6 +59,7 @@ install(
 )
 ament_export_targets(export_${PROJECT_NAME} HAS_LIBRARY_TARGET)
 ament_export_dependencies(lanelet2_core)
+ament_export_dependencies(pugixml)
 
 #############
 ## Testing ##
@@ -80,4 +81,4 @@ if(BUILD_TESTING)
   endforeach()
 endif()
 
-ament_package()
+ament_package(CONFIG_EXTRAS "cmake/ConfigExtras.cmake")
diff --git a/lanelet2_io/cmake/ConfigExtras.cmake b/lanelet2_io/cmake/ConfigExtras.cmake
@@ -0,0 +1,2 @@
+find_package(Boost REQUIRED COMPONENTS filesystem serialization)
+
diff --git a/lanelet2_projection/CMakeLists.txt b/lanelet2_projection/CMakeLists.txt
@@ -6,10 +6,7 @@ project(lanelet2_projection)
 ## Find packages ##
 ###################
 find_package(ament_cmake REQUIRED)
-find_package(PkgConfig)
-find_path(GeographicLib INCLUDE_DIR GeographicLib/config.h
-  PATH_SUFFIXES GeographicLib
-)
+find_package(GeographicLib REQUIRED)
 
 ############################
 ## Read source code files ##
@@ -52,6 +49,7 @@ install(
   RUNTIME DESTINATION bin
 )
 ament_export_targets(export_${PROJECT_NAME} HAS_LIBRARY_TARGET)
+ament_export_dependencies(GeographicLib)
 
 #############
 ## Testing ##
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		find_package(Boost REQUIRED COMPONENTS polygon)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		find_package(Boost REQUIRED COMPONENTS filesystem serialization)