update CMake

usdot-fhwa-stol · Nov 28, 2023 · b4c3c86 · b4c3c86
1 parent 805da3d
commit b4c3c86
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/intersection_model/CMakeLists.txt b/intersection_model/CMakeLists.txt
@@ -1,13 +1,10 @@
 cmake_minimum_required(VERSION 3.10.2)
 project(intersection_model)
-link_directories(
-                "/usr/lib"  
-                "/usr/local/lib" 
-                ${catkin_LIBRARY_DIRS}
-                ${catkin_INCLUDE_DIRS})
+
 find_package(Boost COMPONENTS thread filesystem system REQUIRED)
 find_package(spdlog REQUIRED)
 add_definitions(-DSPDLOG_ACTIVE_LEVEL=SPDLOG_LEVEL_TRACE)
+list(APPEND CMAKE_PREFIX_PATH "/opt/carma/cmake/" "/opt/carma_lanelet2/" "/opt/ros/melodic/share/catkin/cmake")
 
 find_package(PROJ4)
 find_package(Eigen3 3.3 NO_MODULE)

diff --git a/message_services/CMakeLists.txt b/message_services/CMakeLists.txt
@@ -8,7 +8,7 @@ set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
 
-link_directories(${catkin_LIBRARY_DIRS} ${catkin_INCLUDE_DIRS})
+list(APPEND CMAKE_PREFIX_PATH "/opt/carma/cmake/" "/opt/carma_lanelet2/")
 find_package(PROJ4)
 find_package(Eigen3 3.3 NO_MODULE)
 find_package(catkin COMPONENTS