add GPC includes only where needed. also add newmat includes
This commit is contained in:
Christian Schmitt
parent
d6e7ac6b96
commit
37d07e6526
18 changed files with 31 additions and 11 deletions
|
|
@ -123,7 +123,6 @@ include_directories(
|
||||||
${Boost_INCLUDE_DIRS}
|
${Boost_INCLUDE_DIRS}
|
||||||
${ZLIB_INCLUDE_DIR}
|
${ZLIB_INCLUDE_DIR}
|
||||||
${SIMGEAR_INCLUDE_DIR}
|
${SIMGEAR_INCLUDE_DIR}
|
||||||
${GPC_INCLUDE_DIR}
|
|
||||||
)
|
)
|
||||||
|
|
||||||
include_directories(${PROJECT_SOURCE_DIR}/src)
|
include_directories(${PROJECT_SOURCE_DIR}/src)
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,7 @@
|
||||||
|
include_directories(
|
||||||
|
${NEWMAT_INCLUDE_DIR}
|
||||||
|
${GPC_INCLUDE_DIR}
|
||||||
|
)
|
||||||
|
|
||||||
add_executable(genapts
|
add_executable(genapts
|
||||||
apt_surface.hxx apt_surface.cxx
|
apt_surface.hxx apt_surface.cxx
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,8 @@
|
||||||
|
include_directories(
|
||||||
|
${NEWMAT_INCLUDE_DIR}
|
||||||
|
${GPC_INCLUDE_DIR}
|
||||||
|
)
|
||||||
|
|
||||||
add_executable(genapts850
|
add_executable(genapts850
|
||||||
airport.hxx airport.cxx
|
airport.hxx airport.cxx
|
||||||
apt_math.hxx apt_math.cxx
|
apt_math.hxx apt_math.cxx
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,5 @@
|
||||||
|
include_directories(${GPC_INCLUDE_DIR})
|
||||||
|
|
||||||
add_executable(tg-construct
|
add_executable(tg-construct
|
||||||
construct.cxx
|
construct.cxx
|
||||||
construct.hxx
|
construct.hxx
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
|
include_directories(${GPC_INCLUDE_DIR})
|
||||||
|
|
||||||
add_library(Match STATIC
|
add_library(Match STATIC
|
||||||
match.cxx match.hxx
|
match.cxx match.hxx
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,7 @@ if (GDAL_FOUND)
|
||||||
include_directories(${GDAL_INCLUDE_DIR})
|
include_directories(${GDAL_INCLUDE_DIR})
|
||||||
endif (GDAL_FOUND)
|
endif (GDAL_FOUND)
|
||||||
|
|
||||||
|
include_directories(${GPC_INCLUDE_DIR})
|
||||||
include( ${CGAL_USE_FILE} )
|
include( ${CGAL_USE_FILE} )
|
||||||
|
|
||||||
add_library(Geometry STATIC
|
add_library(Geometry STATIC
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
|
include_directories(${GPC_INCLUDE_DIR})
|
||||||
|
|
||||||
add_library(Output STATIC
|
add_library(Output STATIC
|
||||||
output.cxx output.hxx
|
output.cxx output.hxx
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
|
include_directories(${GPC_INCLUDE_DIR})
|
||||||
|
|
||||||
add_library(Polygon STATIC
|
add_library(Polygon STATIC
|
||||||
chop-bin.cxx
|
chop-bin.cxx
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
|
include_directories(${GPC_INCLUDE_DIR})
|
||||||
|
|
||||||
add_library(vpf STATIC
|
add_library(vpf STATIC
|
||||||
component.cxx
|
component.cxx
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,3 @@
|
||||||
|
|
||||||
|
|
||||||
include_directories(${PROJECT_SOURCE_DIR}/src/Lib)
|
include_directories(${PROJECT_SOURCE_DIR}/src/Lib)
|
||||||
|
|
||||||
# seems unfortunate that lib depends on other dirs
|
# seems unfortunate that lib depends on other dirs
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,4 @@
|
||||||
|
include_directories(${GPC_INCLUDE_DIR})
|
||||||
|
|
||||||
add_executable(e00lines
|
add_executable(e00lines
|
||||||
main.cxx)
|
main.cxx)
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,4 @@
|
||||||
|
include_directories(${GPC_INCLUDE_DIR})
|
||||||
|
|
||||||
add_executable(gshhs
|
add_executable(gshhs
|
||||||
main.cxx
|
main.cxx
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,11 @@
|
||||||
|
|
||||||
if (GDAL_FOUND)
|
if (GDAL_FOUND)
|
||||||
|
|
||||||
include_directories(${GDAL_INCLUDE_DIR})
|
include_directories(
|
||||||
|
${GDAL_INCLUDE_DIR}
|
||||||
|
${GPC_INCLUDE_DIR}
|
||||||
|
)
|
||||||
|
|
||||||
add_executable(ogr-decode ogr-decode.cxx)
|
add_executable(ogr-decode ogr-decode.cxx)
|
||||||
|
|
||||||
target_link_libraries(ogr-decode
|
target_link_libraries(ogr-decode
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,4 @@
|
||||||
|
include_directories(${GPC_INCLUDE_DIR})
|
||||||
|
|
||||||
add_executable(photo
|
add_executable(photo
|
||||||
photo.cxx)
|
photo.cxx)
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
|
include_directories(${GPC_INCLUDE_DIR})
|
||||||
|
|
||||||
add_executable(shape-decode shape-decode.cxx)
|
add_executable(shape-decode shape-decode.cxx)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,4 @@
|
||||||
|
include_directories(${GPC_INCLUDE_DIR})
|
||||||
|
|
||||||
add_executable(tgvpf tgvpf.cxx)
|
add_executable(tgvpf tgvpf.cxx)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,4 @@
|
||||||
|
include_directories(${GPC_INCLUDE_DIR})
|
||||||
|
|
||||||
add_executable(tguserdef tguserdef.cxx)
|
add_executable(tguserdef tguserdef.cxx)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,10 @@
|
||||||
|
|
||||||
if (GDAL_FOUND)
|
if (GDAL_FOUND)
|
||||||
|
|
||||||
include_directories(${GDAL_INCLUDE_DIR})
|
include_directories(
|
||||||
|
${GDAL_INCLUDE_DIR}
|
||||||
|
${GPC_INCLUDE_DIR}
|
||||||
|
)
|
||||||
add_executable(poly2ogr poly2ogr.cxx)
|
add_executable(poly2ogr poly2ogr.cxx)
|
||||||
|
|
||||||
if(MSVC)
|
if(MSVC)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue