Skip to content

Commit 14cfed1

Browse files
authored
Hide GDAL includes (#42)
Signed-off-by: Ryan Friedman <[email protected]>
1 parent ea71232 commit 14cfed1

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ target_include_directories(${PROJECT_NAME}
4444
"$<INSTALL_INTERFACE:include/${PROJECT_NAME}>"
4545
)
4646

47-
target_link_libraries(${PROJECT_NAME} PUBLIC Eigen3::Eigen GDAL::GDAL)
47+
target_link_libraries(${PROJECT_NAME} PUBLIC Eigen3::Eigen PRIVATE GDAL::GDAL)
4848

4949
ament_target_dependencies(${PROJECT_NAME} PUBLIC
5050
grid_map_core

include/grid_map_geo/grid_map_geo.hpp

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -39,20 +39,6 @@
3939
#include <grid_map_core/GridMap.hpp>
4040
#include <grid_map_core/iterators/GridMapIterator.hpp>
4141

42-
#if __APPLE__
43-
#include <cpl_string.h>
44-
#include <gdal.h>
45-
#include <gdal_priv.h>
46-
#include <ogr_p.h>
47-
#include <ogr_spatialref.h>
48-
#else
49-
#include <gdal/cpl_string.h>
50-
#include <gdal/gdal.h>
51-
#include <gdal/gdal_priv.h>
52-
#include <gdal/ogr_p.h>
53-
#include <gdal/ogr_spatialref.h>
54-
#endif
55-
5642
#include <iostream>
5743
struct Location {
5844
ESPG espg{ESPG::WGS84};

src/grid_map_geo.cpp

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,20 @@
4444
#include <grid_map_core/iterators/CircleIterator.hpp>
4545
#include <grid_map_core/iterators/GridMapIterator.hpp>
4646

47+
#if __APPLE__
48+
#include <cpl_string.h>
49+
#include <gdal.h>
50+
#include <gdal_priv.h>
51+
#include <ogr_p.h>
52+
#include <ogr_spatialref.h>
53+
#else
54+
#include <gdal/cpl_string.h>
55+
#include <gdal/gdal.h>
56+
#include <gdal/gdal_priv.h>
57+
#include <gdal/ogr_p.h>
58+
#include <gdal/ogr_spatialref.h>
59+
#endif
60+
4761
GridMapGeo::GridMapGeo() {}
4862

4963
GridMapGeo::~GridMapGeo() {}

0 commit comments

Comments
 (0)