fly/flightgear
1
0
Fork 0
Code Activity

Clean-up cmake (linker) dependencies.

Browse source
This commit is contained in:
ThorstenB 2012-02-24 22:23:15 +01:00
parent 572847b4cd
commit da73dd97d3
7 changed files with 12 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CMakeModules/FindSimGear.cmake
View file

@ -192,12 +192,12 @@ else(SIMGEAR_SHARED)
set(SIMGEAR_CORE_LIBRARY_DEPENDENCIES
${CMAKE_THREAD_LIBS_INIT}
${ZLIB_LIBRARY})
${ZLIB_LIBRARY}
${LIBSVN_LIBRARIES})
set(SIMGEAR_SCENE_LIBRARY_DEPENDENCIES
${ALUT_LIBRARY}
${OPENAL_LIBRARY}
${LIBSVN_LIBRARIES})
${OPENAL_LIBRARY})
if(WIN32)
list(APPEND SIMGEAR_CORE_LIBRARY_DEPENDENCIES ws2_32.lib)

5
CMakeModules/FindSvnClient.cmake
View file

@ -70,7 +70,8 @@ if(HAVE_APR_CONFIG OR MSVC)
include(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBSVN DEFAULT_MSG LIBSVN_LIBRARIES LIBSVN_INCLUDE_DIR)
if(NOT LIBSVN_FOUND)
if(NOT LIBSVN_FOUND)
set(LIBSVN_LIBRARIES "")
endif(NOT LIBSVN_FOUND)
endif(NOT LIBSVN_FOUND)
endif(HAVE_APR_CONFIG OR MSVC)

10
src/FDM/YASim/CMakeLists.txt
View file

@ -1,7 +1,7 @@
include(FlightGearComponent)
set(SOURCES
Airplane.cpp
Airplane.cpp
Atmosphere.cpp
ControlMap.cpp
FGFDM.cpp
@ -29,17 +29,15 @@ set(SOURCES
Turbulence.cpp
Wing.cpp
YASim.cxx
)
)
flightgear_component(YASim "${SOURCES}")
add_executable(yasim yasim-test.cpp)
target_link_libraries(yasim
fgYASim
${SIMGEAR_CORE_LIBRARIES}
${SIMGEAR_CORE_LIBRARY_DEPENDENCIES})
${SIMGEAR_CORE_LIBRARY_DEPENDENCIES})
install(TARGETS yasim RUNTIME DESTINATION bin)

6
src/Main/CMakeLists.txt
View file

@ -85,11 +85,8 @@ target_link_libraries(fgfs
install(TARGETS fgfs RUNTIME DESTINATION bin)
check_library_exists(rt clock_gettime "" HAVE_CLOCK_GETTIME)
add_executable(metar metar_main.cxx)
if(HAVE_CLOCK_GETTIME)
target_link_libraries(metar rt)
endif(HAVE_CLOCK_GETTIME)
target_link_libraries(metar
${SIMGEAR_LIBRARIES}
${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}
@ -98,4 +95,3 @@ target_link_libraries(metar
)
install(TARGETS metar RUNTIME DESTINATION bin)

14
utils/GPSsmooth/CMakeLists.txt
View file

@ -1,6 +1,4 @@
check_library_exists(rt clock_gettime "" HAVE_CLOCK_GETTIME)
add_executable(GPSsmooth gps.cxx gps.hxx gps_main.cxx)
add_executable(MIDGsmooth MIDG-II.cxx MIDG-II.hxx MIDG_main.cxx)
add_executable(UGsmooth
@ -10,10 +8,6 @@ add_executable(UGsmooth
UGear_telnet.cxx
UGear_telnet.hxx)
if(HAVE_CLOCK_GETTIME)
target_link_libraries(GPSsmooth rt)
endif(HAVE_CLOCK_GETTIME)
target_link_libraries(GPSsmooth
${SIMGEAR_CORE_LIBRARIES}
${PLIB_SG_LIBRARY}
@ -23,10 +17,6 @@ target_link_libraries(GPSsmooth
${WINMM_LIBRARY}
)
if(HAVE_CLOCK_GETTIME)
target_link_libraries(MIDGsmooth rt)
endif(HAVE_CLOCK_GETTIME)
target_link_libraries(MIDGsmooth
${SIMGEAR_CORE_LIBRARIES}
${PLIB_SG_LIBRARY}
@ -36,10 +26,6 @@ target_link_libraries(MIDGsmooth
${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}
)
if(HAVE_CLOCK_GETTIME)
target_link_libraries(UGsmooth rt)
endif(HAVE_CLOCK_GETTIME)
target_link_libraries(UGsmooth
${SIMGEAR_CORE_LIBRARIES}
${PLIB_SG_LIBRARY}

7
utils/TerraSync/CMakeLists.txt
View file

@ -1,5 +1,4 @@
add_executable(terrasync terrasync.cxx)
target_link_libraries(terrasync
@ -7,10 +6,4 @@ target_link_libraries(terrasync
${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}
)
if(LIBSVN_FOUND)
target_link_libraries(terrasync ${LIBSVN_LIBRARIES})
set_property(TARGET terrasync APPEND PROPERTY COMPILE_FLAGS "${APR_CFLAGS}")
endif()
install(TARGETS terrasync RUNTIME DESTINATION bin)

1
utils/TerraSync/terrasync.cxx
View file

@ -46,6 +46,7 @@
#include <fstream>
#include <string>
#include <simgear/math/SGMath.hxx>
#include <simgear/io/raw_socket.hxx>
#include <simgear/scene/tsync/terrasync.hxx>