Hide GDAL includes (#42)

Signed-off-by: Ryan Friedman <[email protected]>
ethz-asl · Jan 17, 2024 · 14cfed1 · 14cfed1
1 parent ea71232
commit 14cfed1
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -44,7 +44,7 @@ target_include_directories(${PROJECT_NAME}
   "$<INSTALL_INTERFACE:include/${PROJECT_NAME}>"
 )
 
-target_link_libraries(${PROJECT_NAME} PUBLIC Eigen3::Eigen GDAL::GDAL)
+target_link_libraries(${PROJECT_NAME} PUBLIC Eigen3::Eigen PRIVATE GDAL::GDAL)
 
 ament_target_dependencies(${PROJECT_NAME} PUBLIC
   grid_map_core

diff --git a/include/grid_map_geo/grid_map_geo.hpp b/include/grid_map_geo/grid_map_geo.hpp
@@ -39,20 +39,6 @@
 #include <grid_map_core/GridMap.hpp>
 #include <grid_map_core/iterators/GridMapIterator.hpp>
 
-#if __APPLE__
-#include <cpl_string.h>
-#include <gdal.h>
-#include <gdal_priv.h>
-#include <ogr_p.h>
-#include <ogr_spatialref.h>
-#else
-#include <gdal/cpl_string.h>
-#include <gdal/gdal.h>
-#include <gdal/gdal_priv.h>
-#include <gdal/ogr_p.h>
-#include <gdal/ogr_spatialref.h>
-#endif
-
 #include <iostream>
 struct Location {
   ESPG espg{ESPG::WGS84};

diff --git a/src/grid_map_geo.cpp b/src/grid_map_geo.cpp
@@ -44,6 +44,20 @@
 #include <grid_map_core/iterators/CircleIterator.hpp>
 #include <grid_map_core/iterators/GridMapIterator.hpp>
 
+#if __APPLE__
+#include <cpl_string.h>
+#include <gdal.h>
+#include <gdal_priv.h>
+#include <ogr_p.h>
+#include <ogr_spatialref.h>
+#else
+#include <gdal/cpl_string.h>
+#include <gdal/gdal.h>
+#include <gdal/gdal_priv.h>
+#include <gdal/ogr_p.h>
+#include <gdal/ogr_spatialref.h>
+#endif
+
 GridMapGeo::GridMapGeo() {}
 
 GridMapGeo::~GridMapGeo() {}