cmake: fix sequence of (static) library dependencies

sgmath depends on sgprops, sgprops depends on sgstructure.
Also, core libraries are enough for fgadmin.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e1b568b0b2a443e7727c61f2c9404669344d4095..725d8134ce45ddd777d189bdd0d1c637a97e42df 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -173,7 +173,7 @@ find_package(Threads REQUIRED)
 find_package(OpenGL REQUIRED)
 find_package(OpenAL REQUIRED)
 find_package(ALUT REQUIRED)
-find_package(OpenSceneGraph 2.8.1 REQUIRED osgText osgSim osgDB osgParticle osgFX osgUtil osgViewer osgGA)
+find_package(OpenSceneGraph 3.0.0 REQUIRED osgText osgSim osgDB osgParticle osgFX osgUtil osgViewer osgGA)
 
 if(ENABLE_FGADMIN)
   find_package(FLTK)
@@ -298,7 +298,7 @@ add_subdirectory(utils)
 add_subdirectory(man)
 
 set (INSTALL_DOCS 
-    README
+       README
        README.OpenAL
        README.plib
        README.OSG

diff --git a/CMakeModules/FindSimGear.cmake b/CMakeModules/FindSimGear.cmake
index 618f01f04adecd0f9060ad04147edf9f2ee0b105..79887afdc1f022d9475089fc885e46bed451ccc5 100644 (file)
--- a/CMakeModules/FindSimGear.cmake
+++ b/CMakeModules/FindSimGear.cmake
@@ -126,14 +126,15 @@ if(${SIMGEAR_LIBRARIES} STREQUAL "SIMGEAR_LIBRARIES-NOTFOUND")
         io
         serial
         sound
-        structure
+        math
         props
+        structure
         xml
         misc
         threads
         debug
         magvar
-        math)
+    )
 
     set(scene_comps
         ephem
@@ -146,7 +147,7 @@ if(${SIMGEAR_LIBRARIES} STREQUAL "SIMGEAR_LIBRARIES-NOTFOUND")
     foreach(component ${comps})
         find_sg_component(${component} SIMGEAR_CORE_LIBRARIES)
     endforeach()
-        
+
     foreach(component ${scene_comps})
         find_sg_component(${component} SIMGEAR_LIBRARIES)
     endforeach()

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3edc66faed106dd33e3db8dc2408f328c57ccde3..06bc6e3504953f5f30f20cef1dc9279b147cb59f 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -16,8 +16,8 @@ foreach( mylibfolder
                Instrumentation
                Model
                MultiPlayer
-    AIModel
-    Navaids
+               AIModel
+               Navaids
                Network
                Scenery
                Scripting

diff --git a/utils/fgadmin/src/CMakeLists.txt b/utils/fgadmin/src/CMakeLists.txt
index e0f623b60d60894a931d2c95984ba0dde3d6d554..6a6c76bc439b25651bce41b3d0723c845ffcf503 100644 (file)
--- a/utils/fgadmin/src/CMakeLists.txt
+++ b/utils/fgadmin/src/CMakeLists.txt
@@ -6,10 +6,10 @@ add_executable(fgadmin fgadmin_funcs.cxx main.cxx untarka.c)
 add_dependencies(fgadmin FGAdminUI)
 
 target_link_libraries(fgadmin FGAdminUI
-       ${SIMGEAR_LIBRARIES}
+       ${SIMGEAR_CORE_LIBRARIES}
        ${PLIB_LIBRARIES}
        ${FLTK_LIBRARIES}
        ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}
 )
-       
+
 install(TARGETS fgadmin RUNTIME DESTINATION bin)

diff --git a/utils/fgpanel/CMakeLists.txt b/utils/fgpanel/CMakeLists.txt
index 2678babe610066c62ae48d2a77533f7dcab5e4e4..c90b770d620055281d881690634c3ca2e465373a 100644 (file)
--- a/utils/fgpanel/CMakeLists.txt
+++ b/utils/fgpanel/CMakeLists.txt
@@ -6,7 +6,7 @@ if(GLUT_FOUND)
        message(STATUS "found glut")
 
        add_executable(fgpanel main.cxx
-           ApplicationProperties.hxx
+               ApplicationProperties.hxx
                FGGLApplication.cxx 
                FGGLApplication.hxx
                FGPanelApplication.cxx 
@@ -22,7 +22,8 @@ if(GLUT_FOUND)
                panel.cxx 
                panel.hxx
                panel_io.cxx
-               panel_io.hxx)
+               panel_io.hxx
+       )
 
        target_link_libraries(fgpanel 
                ${PNG_LIBRARIES}
@@ -31,7 +32,7 @@ if(GLUT_FOUND)
                ${OPENGL_LIBRARIES}
                ${PLIB_LIBRARIES}
                ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}
-               )
+       )
 
        install(TARGETS fgpanel RUNTIME DESTINATION bin)
 else()