fly/flightgear
1
0
Fork 0
Code Activity

Try to take care of FLTK external dependencies on Linux

Browse source
This commit is contained in:
Frederic Bouvier 2011-12-18 16:18:46 +01:00
parent c964d0e83e
commit dc95e5e84b
2 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
CMakeLists.txt
View file

@ -195,6 +195,13 @@ find_package(OpenSceneGraph 3.0.0 REQUIRED osgText osgSim osgDB osgParticle osgF
if(ENABLE_FGADMIN) if(ENABLE_FGADMIN)
find_package(FLTK) find_package(FLTK)
if ( FLTK_FOUND )
set( CMAKE_REQUIRED_INCLUDES ${FLTK_INCLUDE_DIR} )
set( CMAKE_REQUIRED_LIBRARIES ${FLTK_LIBRARIES} ${X11_Xinerama_LIB} ${X11_Xft_LIB} )
endif ( FLTK_FOUND )
endif(ENABLE_FGADMIN) endif(ENABLE_FGADMIN)
if(ENABLE_LIBSVN) if(ENABLE_LIBSVN)

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

@ -10,6 +10,8 @@ target_link_libraries(fgadmin FGAdminUI
${PLIB_LIBRARIES} ${PLIB_LIBRARIES}
${FLTK_LIBRARIES} ${FLTK_LIBRARIES}
${SIMGEAR_CORE_LIBRARY_DEPENDENCIES} ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}
${X11_Xinerama_LIB}
${X11_Xft_LIB}
) )
install(TARGETS fgadmin RUNTIME DESTINATION bin) install(TARGETS fgadmin RUNTIME DESTINATION bin)