add GPC includes only where needed. also add newmat includes

2012-09-02 16:22:12 +02:00 · 2012-09-02 16:22:12 +02:00 · 37d07e6526
commit 37d07e6526
parent d6e7ac6b96
18 changed files with 31 additions and 11 deletions
--- 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)
--- 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 
--- 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
--- 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
--- 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
--- 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 
--- 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
--- 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
--- 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
--- 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
--- 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)
--- 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
--- 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 
--- 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)
--- 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)

--- 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)

--- 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)

--- 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)