fly/terragear
1
0
Fork 0
Code Activity

Fix underlinking (newer binutils exhibits it)

Browse source
This commit is contained in:
Christian Schmitt 2013-08-17 19:43:30 +02:00
parent d71aacde76
commit 7d13ac32b0
7 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Airports/GenAirports850/CMakeLists.txt
View file

@ -28,6 +28,8 @@ target_link_libraries(genapts850
terragear terragear
Array Array
${GDAL_LIBRARY} ${GDAL_LIBRARY}
${ZLIB_LIBRARY}
${CMAKE_THREAD_LIBS_INIT}
${SIMGEAR_CORE_LIBRARIES} ${SIMGEAR_CORE_LIBRARIES}
${SIMGEAR_CORE_LIBRARY_DEPENDENCIES} ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}
${RT_LIBRARY}) ${RT_LIBRARY})

1
src/BuildTiles/Main/CMakeLists.txt
View file

@ -31,6 +31,7 @@ target_link_libraries(tg-construct
Array landcover Array landcover
${Boost_LIBRARIES} ${Boost_LIBRARIES}
${GDAL_LIBRARY} ${GDAL_LIBRARY}
${ZLIB_LIBRARY}
${SIMGEAR_CORE_LIBRARIES} ${SIMGEAR_CORE_LIBRARIES}
${SIMGEAR_CORE_LIBRARY_DEPENDENCIES} ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}
) )

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

@ -7,6 +7,7 @@ add_executable(test_array testarray.cxx)
target_link_libraries(test_array target_link_libraries(test_array
Array Array
${ZLIB_LIBRARY}
${SIMGEAR_CORE_LIBRARIES} ${SIMGEAR_CORE_LIBRARIES}
${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}) ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES})

5
src/Prep/DemChop/CMakeLists.txt
View file

@ -3,6 +3,7 @@ add_executable(demchop demchop.cxx)
target_link_libraries(demchop target_link_libraries(demchop
DEM DEM
${ZLIB_LIBRARY}
${SIMGEAR_CORE_LIBRARIES} ${SIMGEAR_CORE_LIBRARIES}
${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}) ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES})
@ -12,6 +13,7 @@ add_executable(hgtchop hgtchop.cxx)
target_link_libraries(hgtchop target_link_libraries(hgtchop
HGT HGT
${ZLIB_LIBRARY}
${SIMGEAR_CORE_LIBRARIES} ${SIMGEAR_CORE_LIBRARIES}
${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}) ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES})
@ -24,6 +26,7 @@ endif(MSVC AND CMAKE_CL_64)
add_executable(srtmchop srtmchop.cxx) add_executable(srtmchop srtmchop.cxx)
target_link_libraries(srtmchop target_link_libraries(srtmchop
HGT HGT
${ZLIB_LIBRARY}
${TIFF_LIBRARIES} ${TIFF_LIBRARIES}
${SRTMCHOP_LIBRARIES} ${SRTMCHOP_LIBRARIES}
${SIMGEAR_CORE_LIBRARIES} ${SIMGEAR_CORE_LIBRARIES}
@ -35,6 +38,7 @@ endif(TIFF_FOUND)
add_executable(fillvoids fillvoids.cxx) add_executable(fillvoids fillvoids.cxx)
target_link_libraries(fillvoids target_link_libraries(fillvoids
Array Array
${ZLIB_LIBRARY}
${SIMGEAR_CORE_LIBRARIES} ${SIMGEAR_CORE_LIBRARIES}
${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}) ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES})
@ -43,6 +47,7 @@ install(TARGETS fillvoids RUNTIME DESTINATION bin)
add_executable(testassem testassem.cxx) add_executable(testassem testassem.cxx)
target_link_libraries(testassem target_link_libraries(testassem
Array Array
${ZLIB_LIBRARY}
${SIMGEAR_CORE_LIBRARIES} ${SIMGEAR_CORE_LIBRARIES}
${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}) ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES})

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

@ -3,6 +3,7 @@ add_executable(gdalchop gdalchop.cxx)
target_link_libraries(gdalchop target_link_libraries(gdalchop
terragear ${GDAL_LIBRARY} terragear ${GDAL_LIBRARY}
${ZLIB_LIBRARY}
${SIMGEAR_CORE_LIBRARIES} ${SIMGEAR_CORE_LIBRARIES}
${SIMGEAR_CORE_LIBRARY_DEPENDENCIES} ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}
) )

2
src/Prep/OGRDecode/CMakeLists.txt
View file

@ -4,6 +4,8 @@ add_executable(ogr-decode ogr-decode.cxx)
target_link_libraries(ogr-decode target_link_libraries(ogr-decode
${GDAL_LIBRARY} ${GDAL_LIBRARY}
terragear terragear
${ZLIB_LIBRARY}
${CMAKE_THREAD_LIBS_INIT}
${SIMGEAR_CORE_LIBRARIES} ${SIMGEAR_CORE_LIBRARIES}
${SIMGEAR_CORE_LIBRARY_DEPENDENCIES} ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}
) )

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

@ -3,6 +3,7 @@ add_executable(terrafit terrafit.cc)
target_link_libraries(terrafit target_link_libraries(terrafit
Array Terra Array Terra
${ZLIB_LIBRARY}
${SIMGEAR_CORE_LIBRARIES} ${SIMGEAR_CORE_LIBRARIES}
${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}) ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES})