addressed comments

usdot-fhwa-stol · Nov 15, 2024 · c232eb9 · c232eb9
1 parent 776a098
commit c232eb9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/common/lanelet2_extension/CMakeLists.txt b/common/lanelet2_extension/CMakeLists.txt
@@ -33,8 +33,7 @@ find_path(PUGIXML_INCLUDE_DIRS
   PATH_SUFFIXES pugixml
 )
 
-set(PROJ_INCLUDE_DIRS "/usr/include/proj")
-set(PROJ_LIBRARIES "proj")
+find_package(PROJ REQUIRED)
 find_package(Boost REQUIRED)
 
 
@@ -181,7 +180,7 @@ else()
     ${GeographicLib_INCLUDE_DIRS}
     ${catkin_INCLUDE_DIRS}
     ${PUGIXML_INCLUDE_DIRS}
-    ${PROJ_INCLUDE_DIRS}
+    ${PROJ4_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
     ${${LOGGER_DEP}_INCLUDE_DIRS}
   )
@@ -200,7 +199,7 @@ else()
   target_link_libraries(lanelet2_extension_lib
     ${catkin_LIBRARIES}
     ${GeographicLib_LIBRARIES}
-    ${PROJ_LIBRARIES}
+    ${PROJ4_LIBRARIES}
     ${Boost_LIBRARIES}
     ${${LOGGER_DEP}_LIBRARIES}
   )

diff --git a/docker/install.sh b/docker/install.sh
@@ -19,7 +19,7 @@ if [[ ! -z "$ROS1_PACKAGES$ROS2_PACKAGES" ]]; then
     source /opt/autoware.ai/ros/install/setup.bash
 else
     echo "Sourcing base image for full build..."
-    source /opt/ros/humble/setup.bash
+    source /home/carma/.base-image/init-env.sh
 fi
 
 # Enter source directory