From d8d3be6fb1a38a5e7882cabdd03c5e8c8ac1cfbe Mon Sep 17 00:00:00 2001 From: Christian Schmitt Date: Tue, 25 Oct 2011 01:05:49 +0200 Subject: [PATCH] Change SG linking order and add more tools to the cmake build system that compile now. Also change .gitignore files to include some new binary names --- CMakeModules/FindSimGear.cmake | 4 ++-- src/Lib/Array/.gitignore | 1 + src/Lib/Array/CMakeLists.txt | 3 ++- src/Lib/HGT/.gitignore | 1 + src/Lib/landcover/.gitignore | 1 + src/Prep/CMakeLists.txt | 5 +++-- src/Prep/DemRaw2ascii/main.cxx | 5 ++--- src/Prep/E00Lines/CMakeLists.txt | 1 + src/Prep/GSHHS/.gitignore | 1 + src/Prep/TGVPF/CMakeLists.txt | 1 + src/Prep/Terra/.gitignore | 1 + src/Prep/UserDef/CMakeLists.txt | 10 ++++++++++ 12 files changed, 26 insertions(+), 8 deletions(-) create mode 100644 src/Prep/UserDef/CMakeLists.txt diff --git a/CMakeModules/FindSimGear.cmake b/CMakeModules/FindSimGear.cmake index 5489b32d..19af92f0 100644 --- a/CMakeModules/FindSimGear.cmake +++ b/CMakeModules/FindSimGear.cmake @@ -121,14 +121,14 @@ if(${SIMGEAR_LIBRARIES} STREQUAL "SIMGEAR_LIBRARIES-NOTFOUND") timing io serial + math structure props xml misc threads debug - magvar - math) + magvar) set(scene_comps ephem diff --git a/src/Lib/Array/.gitignore b/src/Lib/Array/.gitignore index 9059adaf..665b94ef 100644 --- a/src/Lib/Array/.gitignore +++ b/src/Lib/Array/.gitignore @@ -1 +1,2 @@ testarray +test_array diff --git a/src/Lib/Array/CMakeLists.txt b/src/Lib/Array/CMakeLists.txt index 290abe55..6cdb0ae9 100644 --- a/src/Lib/Array/CMakeLists.txt +++ b/src/Lib/Array/CMakeLists.txt @@ -1,5 +1,4 @@ - add_library(Array STATIC array.cxx array.hxx ) @@ -10,3 +9,5 @@ target_link_libraries(test_array Array ${SIMGEAR_CORE_LIBRARIES} ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}) + +install(TARGETS test_array RUNTIME DESTINATION bin) diff --git a/src/Lib/HGT/.gitignore b/src/Lib/HGT/.gitignore index 23f6d16c..c54d66aa 100644 --- a/src/Lib/HGT/.gitignore +++ b/src/Lib/HGT/.gitignore @@ -1 +1,2 @@ testhgt +test_hgt diff --git a/src/Lib/landcover/.gitignore b/src/Lib/landcover/.gitignore index e97a3896..1fc8c159 100644 --- a/src/Lib/landcover/.gitignore +++ b/src/Lib/landcover/.gitignore @@ -1 +1,2 @@ test-landcover +test_landcover diff --git a/src/Prep/CMakeLists.txt b/src/Prep/CMakeLists.txt index 2aa97703..367d509c 100644 --- a/src/Prep/CMakeLists.txt +++ b/src/Prep/CMakeLists.txt @@ -9,11 +9,12 @@ add_subdirectory(GDALChop) add_subdirectory(GSHHS) add_subdirectory(DemChop) add_subdirectory(DemInfo) -#add_subdirectory(DemRaw2ascii) +add_subdirectory(DemRaw2ascii) add_subdirectory(E00Lines) -#add_subdirectory(Photo) +add_subdirectory(Photo) add_subdirectory(ShapeFile) add_subdirectory(TGVPF) add_subdirectory(Terra) add_subdirectory(TerraFit) add_subdirectory(OGRDecode) +add_subdirectory(UserDef) diff --git a/src/Prep/DemRaw2ascii/main.cxx b/src/Prep/DemRaw2ascii/main.cxx index 6172f94a..b915f3d6 100644 --- a/src/Prep/DemRaw2ascii/main.cxx +++ b/src/Prep/DemRaw2ascii/main.cxx @@ -34,9 +34,8 @@ #ifdef HAVE_UNISTD_H # include /* tmp for read() */ #endif -#ifdef HAVE_STDLIB_H -# include -#endif + +#include extern "C" { #include "rawdem.h" diff --git a/src/Prep/E00Lines/CMakeLists.txt b/src/Prep/E00Lines/CMakeLists.txt index b776b88f..06010f80 100644 --- a/src/Prep/E00Lines/CMakeLists.txt +++ b/src/Prep/E00Lines/CMakeLists.txt @@ -9,3 +9,4 @@ target_link_libraries(e00lines ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES} ${GPC_LIBRARY}) +install(TARGETS e00lines RUNTIME DESTINATION bin) diff --git a/src/Prep/GSHHS/.gitignore b/src/Prep/GSHHS/.gitignore index a2e0b6d0..7e6519be 100644 --- a/src/Prep/GSHHS/.gitignore +++ b/src/Prep/GSHHS/.gitignore @@ -1,2 +1,3 @@ debug gshhs +gshhs_debug diff --git a/src/Prep/TGVPF/CMakeLists.txt b/src/Prep/TGVPF/CMakeLists.txt index b7b945fa..76e61d69 100644 --- a/src/Prep/TGVPF/CMakeLists.txt +++ b/src/Prep/TGVPF/CMakeLists.txt @@ -7,3 +7,4 @@ target_link_libraries(tgvpf ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES} ${GPC_LIBRARY}) +install(TARGETS tgvpf RUNTIME DESTINATION bin) diff --git a/src/Prep/Terra/.gitignore b/src/Prep/Terra/.gitignore index b5dcabc3..b90e7a2b 100644 --- a/src/Prep/Terra/.gitignore +++ b/src/Prep/Terra/.gitignore @@ -1,2 +1,3 @@ terra xterra +terra_bin diff --git a/src/Prep/UserDef/CMakeLists.txt b/src/Prep/UserDef/CMakeLists.txt new file mode 100644 index 00000000..9aca017a --- /dev/null +++ b/src/Prep/UserDef/CMakeLists.txt @@ -0,0 +1,10 @@ + +add_executable(tguserdef tguserdef.cxx) + +target_link_libraries(tguserdef + Polygon Geometry Output poly2tri TriangleJRS + ${SIMGEAR_CORE_LIBRARIES} + ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES} + ${GPC_LIBRARY}) + +install(TARGETS tguserdef RUNTIME DESTINATION bin)