fly/terragear
1
0
Fork 0
Code Activity

Change SG linking order and add more tools to the cmake build system

Browse source 
that compile now. Also change .gitignore files to include some new
binary names
This commit is contained in:
Christian Schmitt 2011-10-25 01:05:49 +02:00
parent 89ca2ae1e4
commit d8d3be6fb1
12 changed files with 26 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeModules/FindSimGear.cmake
View file

@ -121,14 +121,14 @@ if(${SIMGEAR_LIBRARIES} STREQUAL "SIMGEAR_LIBRARIES-NOTFOUND")
timing timing
io io
serial serial
math
structure structure
props props
xml xml
misc misc
threads threads
debug debug
magvar magvar)
math)
set(scene_comps set(scene_comps
ephem ephem

1
src/Lib/Array/.gitignore vendored
View file

@ -1 +1,2 @@
testarray testarray
test_array

3
src/Lib/Array/CMakeLists.txt
View file

@ -1,5 +1,4 @@
add_library(Array STATIC add_library(Array STATIC
array.cxx array.hxx array.cxx array.hxx
) )
@ -10,3 +9,5 @@ target_link_libraries(test_array
Array Array
${SIMGEAR_CORE_LIBRARIES} ${SIMGEAR_CORE_LIBRARIES}
${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}) ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES})
install(TARGETS test_array RUNTIME DESTINATION bin)

1
src/Lib/HGT/.gitignore vendored
View file

@ -1 +1,2 @@
testhgt testhgt
test_hgt

1
src/Lib/landcover/.gitignore vendored
View file

@ -1 +1,2 @@
test-landcover test-landcover
test_landcover

5
src/Prep/CMakeLists.txt
View file

@ -9,11 +9,12 @@ add_subdirectory(GDALChop)
add_subdirectory(GSHHS) add_subdirectory(GSHHS)
add_subdirectory(DemChop) add_subdirectory(DemChop)
add_subdirectory(DemInfo) add_subdirectory(DemInfo)
#add_subdirectory(DemRaw2ascii) add_subdirectory(DemRaw2ascii)
add_subdirectory(E00Lines) add_subdirectory(E00Lines)
#add_subdirectory(Photo) add_subdirectory(Photo)
add_subdirectory(ShapeFile) add_subdirectory(ShapeFile)
add_subdirectory(TGVPF) add_subdirectory(TGVPF)
add_subdirectory(Terra) add_subdirectory(Terra)
add_subdirectory(TerraFit) add_subdirectory(TerraFit)
add_subdirectory(OGRDecode) add_subdirectory(OGRDecode)
add_subdirectory(UserDef)

5
src/Prep/DemRaw2ascii/main.cxx
View file

@ -34,9 +34,8 @@
#ifdef HAVE_UNISTD_H #ifdef HAVE_UNISTD_H
# include <unistd.h> /* tmp for read() */ # include <unistd.h> /* tmp for read() */
#endif #endif
#ifdef HAVE_STDLIB_H
# include <stdlib.h> #include <cstdlib>
#endif
extern "C" { extern "C" {
#include "rawdem.h" #include "rawdem.h"

1
src/Prep/E00Lines/CMakeLists.txt
View file

@ -9,3 +9,4 @@ target_link_libraries(e00lines
${SIMGEAR_CORE_LIBRARY_DEPENDENCIES} ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}
${GPC_LIBRARY}) ${GPC_LIBRARY})
install(TARGETS e00lines RUNTIME DESTINATION bin)

1
src/Prep/GSHHS/.gitignore vendored
View file

@ -1,2 +1,3 @@
debug debug
gshhs gshhs
gshhs_debug

1
src/Prep/TGVPF/CMakeLists.txt
View file

@ -7,3 +7,4 @@ target_link_libraries(tgvpf
${SIMGEAR_CORE_LIBRARY_DEPENDENCIES} ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}
${GPC_LIBRARY}) ${GPC_LIBRARY})
install(TARGETS tgvpf RUNTIME DESTINATION bin)

1
src/Prep/Terra/.gitignore vendored
View file

@ -1,2 +1,3 @@
terra terra
xterra xterra
terra_bin

10
src/Prep/UserDef/CMakeLists.txt Normal file
View file

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