Linux link fixes from Olaf Flebbe

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f3576060e286573a93137f401021e66b1810de7e..08b2cdd1ee4ca68eabc39bceda385a695c3a988d 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -100,7 +100,7 @@ find_package(Threads REQUIRED)
 find_package(OpenGL REQUIRED)
 find_package(OpenAL REQUIRED)
 find_package(ALUT REQUIRED)
-find_package(OpenSceneGraph 2.8.2 REQUIRED osgText osgSim osgDB osgParticle osgFX osgUtil osgViewer osgGA)
+find_package(OpenSceneGraph 2.8.1 REQUIRED osgText osgSim osgDB osgParticle osgFX osgUtil osgViewer osgGA)
 
 if(ENABLE_FGADMIN)
   find_package(FLTK)

diff --git a/utils/GPSsmooth/CMakeLists.txt b/utils/GPSsmooth/CMakeLists.txt
index 9cff68b6aa565e537b037e1f7018f282d5e4ebf1..56ed1b46373b943028389da2a7c9f465cf52e872 100644 (file)
--- a/utils/GPSsmooth/CMakeLists.txt
+++ b/utils/GPSsmooth/CMakeLists.txt
@@ -4,11 +4,11 @@ add_executable(MIDGsmooth MIDG-II.cxx MIDG_main.cxx)
 add_executable(UGsmooth UGear.cxx UGear_command.cxx UGear_main.cxx UGear_telnet.cxx)
 
 target_link_libraries(GPSsmooth 
-       ${SIMGEAR_DEBUG_LIBRARY}
        ${SIMGEAR_IO_LIBRARY}
        ${SIMGEAR_MISC_LIBRARY}
        ${SIMGEAR_STRUCTURE_LIBRARY}
        ${SIMGEAR_TIMING_LIBRARY}
+       ${SIMGEAR_DEBUG_LIBRARY}
        ${PLIB_SG_LIBRARY}
        ${PLIB_UL_LIBRARY}
        ${ZLIB_LIBRARIES}
@@ -19,12 +19,12 @@ target_link_libraries(GPSsmooth
 )
 
 target_link_libraries(MIDGsmooth 
-       ${SIMGEAR_DEBUG_LIBRARY}
        ${SIMGEAR_IO_LIBRARY}
        ${SIMGEAR_MATH_LIBRARY}
        ${SIMGEAR_SERIAL_LIBRARY}
        ${SIMGEAR_STRUCTURE_LIBRARY}
        ${SIMGEAR_TIMING_LIBRARY}
+       ${SIMGEAR_DEBUG_LIBRARY}
        ${PLIB_SG_LIBRARY}
        ${PLIB_UL_LIBRARY}
        ${WINMM_LIBRARY}