]> git.mxchange.org Git - flightgear.git/commitdiff
Try to take care of FLTK external dependencies on Linux
authorFrederic Bouvier <fredfgfs01@free.fr>
Sun, 18 Dec 2011 15:18:46 +0000 (16:18 +0100)
committerFrederic Bouvier <fredfgfs01@free.fr>
Sun, 18 Dec 2011 15:18:46 +0000 (16:18 +0100)
CMakeLists.txt
utils/fgadmin/src/CMakeLists.txt

index cb1156a2df9da951caa0cc9eb6e4b3d8a013ba2d..a6a3194a2ebf1daf5572233cd2830051e4a1685c 100644 (file)
@@ -195,6 +195,13 @@ find_package(OpenSceneGraph 3.0.0 REQUIRED osgText osgSim osgDB osgParticle osgF
 
 if(ENABLE_FGADMIN)
   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)
 
 if(ENABLE_LIBSVN)
index 6a6c76bc439b25651bce41b3d0723c845ffcf503..12776ef54b79122db67461637132f650bb4e3e9e 100644 (file)
@@ -10,6 +10,8 @@ target_link_libraries(fgadmin FGAdminUI
        ${PLIB_LIBRARIES}
        ${FLTK_LIBRARIES}
        ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}
+       ${X11_Xinerama_LIB}
+       ${X11_Xft_LIB}
 )
 
 install(TARGETS fgadmin RUNTIME DESTINATION bin)