fly/flightgear
1
0
Fork 0
Code Activity

cmake: fix sequence of (static) library dependencies

Browse source 
sgmath depends on sgprops, sgprops depends on sgstructure.
Also, core libraries are enough for fgadmin.
This commit is contained in:
ThorstenB 2011-11-26 16:41:35 +01:00
parent 90c5c9f87a
commit b54defea52
5 changed files with 14 additions and 12 deletions

4
CMakeLists.txt
View file

@ -173,7 +173,7 @@ find_package(Threads REQUIRED)
find_package(OpenGL REQUIRED) find_package(OpenGL REQUIRED)
find_package(OpenAL REQUIRED) find_package(OpenAL REQUIRED)
find_package(ALUT 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) if(ENABLE_FGADMIN)
find_package(FLTK) find_package(FLTK)
@ -298,7 +298,7 @@ add_subdirectory(utils)
add_subdirectory(man) add_subdirectory(man)
set (INSTALL_DOCS set (INSTALL_DOCS
README README
README.OpenAL README.OpenAL
README.plib README.plib
README.OSG README.OSG

7
CMakeModules/FindSimGear.cmake
View file

@ -126,14 +126,15 @@ if(${SIMGEAR_LIBRARIES} STREQUAL "SIMGEAR_LIBRARIES-NOTFOUND")
io io
serial serial
sound sound
structure math
props props
structure
xml xml
misc misc
threads threads
debug debug
magvar magvar
math) )
set(scene_comps set(scene_comps
ephem ephem
@ -146,7 +147,7 @@ if(${SIMGEAR_LIBRARIES} STREQUAL "SIMGEAR_LIBRARIES-NOTFOUND")
foreach(component ${comps}) foreach(component ${comps})
find_sg_component(${component} SIMGEAR_CORE_LIBRARIES) find_sg_component(${component} SIMGEAR_CORE_LIBRARIES)
endforeach() endforeach()
foreach(component ${scene_comps}) foreach(component ${scene_comps})
find_sg_component(${component} SIMGEAR_LIBRARIES) find_sg_component(${component} SIMGEAR_LIBRARIES)
endforeach() endforeach()

4
src/CMakeLists.txt
View file

@ -16,8 +16,8 @@ foreach( mylibfolder
Instrumentation Instrumentation
Model Model
MultiPlayer MultiPlayer
AIModel AIModel
Navaids Navaids
Network Network
Scenery Scenery
Scripting Scripting

4
utils/fgadmin/src/CMakeLists.txt
View file

@ -6,10 +6,10 @@ add_executable(fgadmin fgadmin_funcs.cxx main.cxx untarka.c)
add_dependencies(fgadmin FGAdminUI) add_dependencies(fgadmin FGAdminUI)
target_link_libraries(fgadmin FGAdminUI target_link_libraries(fgadmin FGAdminUI
${SIMGEAR_LIBRARIES} ${SIMGEAR_CORE_LIBRARIES}
${PLIB_LIBRARIES} ${PLIB_LIBRARIES}
${FLTK_LIBRARIES} ${FLTK_LIBRARIES}
${SIMGEAR_CORE_LIBRARY_DEPENDENCIES} ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}
) )
install(TARGETS fgadmin RUNTIME DESTINATION bin) install(TARGETS fgadmin RUNTIME DESTINATION bin)

7
utils/fgpanel/CMakeLists.txt
View file

@ -6,7 +6,7 @@ if(GLUT_FOUND)
message(STATUS "found glut") message(STATUS "found glut")
add_executable(fgpanel main.cxx add_executable(fgpanel main.cxx
ApplicationProperties.hxx ApplicationProperties.hxx
FGGLApplication.cxx FGGLApplication.cxx
FGGLApplication.hxx FGGLApplication.hxx
FGPanelApplication.cxx FGPanelApplication.cxx
@ -22,7 +22,8 @@ if(GLUT_FOUND)
panel.cxx panel.cxx
panel.hxx panel.hxx
panel_io.cxx panel_io.cxx
panel_io.hxx) panel_io.hxx
)
target_link_libraries(fgpanel target_link_libraries(fgpanel
${PNG_LIBRARIES} ${PNG_LIBRARIES}
@ -31,7 +32,7 @@ if(GLUT_FOUND)
${OPENGL_LIBRARIES} ${OPENGL_LIBRARIES}
${PLIB_LIBRARIES} ${PLIB_LIBRARIES}
${SIMGEAR_CORE_LIBRARY_DEPENDENCIES} ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}
) )
install(TARGETS fgpanel RUNTIME DESTINATION bin) install(TARGETS fgpanel RUNTIME DESTINATION bin)
else() else()