diff --git a/CMakeLists.txt b/CMakeLists.txt index d2671816..6473ea2b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -123,7 +123,6 @@ include_directories( ${Boost_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR} ${SIMGEAR_INCLUDE_DIR} - ${GPC_INCLUDE_DIR} ) include_directories(${PROJECT_SOURCE_DIR}/src) diff --git a/src/Airports/GenAirports/CMakeLists.txt b/src/Airports/GenAirports/CMakeLists.txt index d5cc15bf..342f5c0b 100644 --- a/src/Airports/GenAirports/CMakeLists.txt +++ b/src/Airports/GenAirports/CMakeLists.txt @@ -1,4 +1,7 @@ - +include_directories( + ${NEWMAT_INCLUDE_DIR} + ${GPC_INCLUDE_DIR} + ) add_executable(genapts apt_surface.hxx apt_surface.cxx diff --git a/src/Airports/GenAirports850/CMakeLists.txt b/src/Airports/GenAirports850/CMakeLists.txt index c3034944..525f7c9f 100644 --- a/src/Airports/GenAirports850/CMakeLists.txt +++ b/src/Airports/GenAirports850/CMakeLists.txt @@ -1,3 +1,8 @@ +include_directories( + ${NEWMAT_INCLUDE_DIR} + ${GPC_INCLUDE_DIR} +) + add_executable(genapts850 airport.hxx airport.cxx apt_math.hxx apt_math.cxx diff --git a/src/BuildTiles/Main/CMakeLists.txt b/src/BuildTiles/Main/CMakeLists.txt index 147612ff..7b84e02d 100644 --- a/src/BuildTiles/Main/CMakeLists.txt +++ b/src/BuildTiles/Main/CMakeLists.txt @@ -1,3 +1,5 @@ +include_directories(${GPC_INCLUDE_DIR}) + add_executable(tg-construct construct.cxx construct.hxx diff --git a/src/BuildTiles/Match/CMakeLists.txt b/src/BuildTiles/Match/CMakeLists.txt index 86efd725..6edeeb08 100644 --- a/src/BuildTiles/Match/CMakeLists.txt +++ b/src/BuildTiles/Match/CMakeLists.txt @@ -1,4 +1,4 @@ - +include_directories(${GPC_INCLUDE_DIR}) add_library(Match STATIC match.cxx match.hxx diff --git a/src/Lib/Geometry/CMakeLists.txt b/src/Lib/Geometry/CMakeLists.txt index a4728b7e..be562533 100644 --- a/src/Lib/Geometry/CMakeLists.txt +++ b/src/Lib/Geometry/CMakeLists.txt @@ -2,6 +2,7 @@ if (GDAL_FOUND) include_directories(${GDAL_INCLUDE_DIR}) endif (GDAL_FOUND) +include_directories(${GPC_INCLUDE_DIR}) include( ${CGAL_USE_FILE} ) add_library(Geometry STATIC diff --git a/src/Lib/Output/CMakeLists.txt b/src/Lib/Output/CMakeLists.txt index 9e836a20..331282d5 100644 --- a/src/Lib/Output/CMakeLists.txt +++ b/src/Lib/Output/CMakeLists.txt @@ -1,4 +1,4 @@ - +include_directories(${GPC_INCLUDE_DIR}) add_library(Output STATIC output.cxx output.hxx diff --git a/src/Lib/Polygon/CMakeLists.txt b/src/Lib/Polygon/CMakeLists.txt index 3bd7c47c..131e786a 100644 --- a/src/Lib/Polygon/CMakeLists.txt +++ b/src/Lib/Polygon/CMakeLists.txt @@ -1,4 +1,4 @@ - +include_directories(${GPC_INCLUDE_DIR}) add_library(Polygon STATIC chop-bin.cxx diff --git a/src/Lib/vpf/CMakeLists.txt b/src/Lib/vpf/CMakeLists.txt index 1ebb362f..2ea70e94 100644 --- a/src/Lib/vpf/CMakeLists.txt +++ b/src/Lib/vpf/CMakeLists.txt @@ -1,4 +1,4 @@ - +include_directories(${GPC_INCLUDE_DIR}) add_library(vpf STATIC component.cxx diff --git a/src/Prep/CMakeLists.txt b/src/Prep/CMakeLists.txt index 367d509c..fe837908 100644 --- a/src/Prep/CMakeLists.txt +++ b/src/Prep/CMakeLists.txt @@ -1,5 +1,3 @@ - - include_directories(${PROJECT_SOURCE_DIR}/src/Lib) # seems unfortunate that lib depends on other dirs diff --git a/src/Prep/E00Lines/CMakeLists.txt b/src/Prep/E00Lines/CMakeLists.txt index 06010f80..5989d77d 100644 --- a/src/Prep/E00Lines/CMakeLists.txt +++ b/src/Prep/E00Lines/CMakeLists.txt @@ -1,3 +1,4 @@ +include_directories(${GPC_INCLUDE_DIR}) add_executable(e00lines main.cxx) diff --git a/src/Prep/GSHHS/CMakeLists.txt b/src/Prep/GSHHS/CMakeLists.txt index 47e99965..d3d97b93 100644 --- a/src/Prep/GSHHS/CMakeLists.txt +++ b/src/Prep/GSHHS/CMakeLists.txt @@ -1,3 +1,4 @@ +include_directories(${GPC_INCLUDE_DIR}) add_executable(gshhs main.cxx diff --git a/src/Prep/OGRDecode/CMakeLists.txt b/src/Prep/OGRDecode/CMakeLists.txt index 17e7cf0e..b3af14b6 100644 --- a/src/Prep/OGRDecode/CMakeLists.txt +++ b/src/Prep/OGRDecode/CMakeLists.txt @@ -1,7 +1,11 @@ if (GDAL_FOUND) -include_directories(${GDAL_INCLUDE_DIR}) +include_directories( + ${GDAL_INCLUDE_DIR} + ${GPC_INCLUDE_DIR} +) + add_executable(ogr-decode ogr-decode.cxx) target_link_libraries(ogr-decode diff --git a/src/Prep/Photo/CMakeLists.txt b/src/Prep/Photo/CMakeLists.txt index b2d57581..1a2ae5c5 100644 --- a/src/Prep/Photo/CMakeLists.txt +++ b/src/Prep/Photo/CMakeLists.txt @@ -1,3 +1,4 @@ +include_directories(${GPC_INCLUDE_DIR}) add_executable(photo photo.cxx) diff --git a/src/Prep/ShapeFile/CMakeLists.txt b/src/Prep/ShapeFile/CMakeLists.txt index 3f75f3df..54c4a819 100644 --- a/src/Prep/ShapeFile/CMakeLists.txt +++ b/src/Prep/ShapeFile/CMakeLists.txt @@ -1,4 +1,4 @@ - +include_directories(${GPC_INCLUDE_DIR}) add_executable(shape-decode shape-decode.cxx) diff --git a/src/Prep/TGVPF/CMakeLists.txt b/src/Prep/TGVPF/CMakeLists.txt index 70911aed..edefab39 100644 --- a/src/Prep/TGVPF/CMakeLists.txt +++ b/src/Prep/TGVPF/CMakeLists.txt @@ -1,3 +1,4 @@ +include_directories(${GPC_INCLUDE_DIR}) add_executable(tgvpf tgvpf.cxx) diff --git a/src/Prep/UserDef/CMakeLists.txt b/src/Prep/UserDef/CMakeLists.txt index 9aca017a..135b71ff 100644 --- a/src/Prep/UserDef/CMakeLists.txt +++ b/src/Prep/UserDef/CMakeLists.txt @@ -1,3 +1,4 @@ +include_directories(${GPC_INCLUDE_DIR}) add_executable(tguserdef tguserdef.cxx) diff --git a/src/Utils/poly2ogr/CMakeLists.txt b/src/Utils/poly2ogr/CMakeLists.txt index 12a0e8c5..8012af26 100644 --- a/src/Utils/poly2ogr/CMakeLists.txt +++ b/src/Utils/poly2ogr/CMakeLists.txt @@ -1,7 +1,10 @@ if (GDAL_FOUND) -include_directories(${GDAL_INCLUDE_DIR}) +include_directories( + ${GDAL_INCLUDE_DIR} + ${GPC_INCLUDE_DIR} +) add_executable(poly2ogr poly2ogr.cxx) if(MSVC)