Clean-up cmake (linker) dependencies.

diff --git a/CMakeModules/FindSimGear.cmake b/CMakeModules/FindSimGear.cmake
index 2764fa7eb651d71c538d4eb590065608b0a31d01..901b63c6864ca283533b9a0f48ec2fd1a6adbc8b 100644 (file)
--- a/CMakeModules/FindSimGear.cmake
+++ b/CMakeModules/FindSimGear.cmake
@@ -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)

diff --git a/CMakeModules/FindSvnClient.cmake b/CMakeModules/FindSvnClient.cmake
index 15f6ba27a630dd2c4ff687e0839c76edd1549bdb..1135ee03bd1c30374dba0ed9c0e883d1a0c51b59 100644 (file)
--- a/CMakeModules/FindSvnClient.cmake
+++ b/CMakeModules/FindSvnClient.cmake
@@ -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)

diff --git a/src/FDM/YASim/CMakeLists.txt b/src/FDM/YASim/CMakeLists.txt
index d129acef286d3f7f7ecf35b84933b02db0eb0743..d774a1d04ef570cc6aa59325d32fed0dabd90a26 100644 (file)
--- a/src/FDM/YASim/CMakeLists.txt
+++ b/src/FDM/YASim/CMakeLists.txt
@@ -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)
-       
-

diff --git a/src/Main/CMakeLists.txt b/src/Main/CMakeLists.txt
index f96ca1e07e12bc7ef2eac062476d83ba36ac5c04..718c052a05f1a2752d0e263f4138db4b3a042475 100644 (file)
--- a/src/Main/CMakeLists.txt
+++ b/src/Main/CMakeLists.txt
@@ -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)
-

diff --git a/utils/GPSsmooth/CMakeLists.txt b/utils/GPSsmooth/CMakeLists.txt
index 8844bb341a350b82fd7a5366a9e27194d893da00..47bc1d54f69a084a0aa7f3944f2b2afdeb995657 100644 (file)
--- a/utils/GPSsmooth/CMakeLists.txt
+++ b/utils/GPSsmooth/CMakeLists.txt
@@ -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}

diff --git a/utils/TerraSync/CMakeLists.txt b/utils/TerraSync/CMakeLists.txt
index 783cdffca69ca78e7c064be9a7a879d2f847ea6b..cc27ec82b4890b9ec3973693290bf0f1dd7963d9 100644 (file)
--- a/utils/TerraSync/CMakeLists.txt
+++ b/utils/TerraSync/CMakeLists.txt
@@ -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)

diff --git a/utils/TerraSync/terrasync.cxx b/utils/TerraSync/terrasync.cxx
index f8b8b25511d8f55d4b80f3ced0e426208951fb14..fb0d29258707f9c8138c052d4e4fce3043ec8dc8 100644 (file)
--- a/utils/TerraSync/terrasync.cxx
+++ b/utils/TerraSync/terrasync.cxx
@@ -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>