From dc95e5e84be9c020c005fd5ae2ea39680d919848 Mon Sep 17 00:00:00 2001 From: Frederic Bouvier Date: Sun, 18 Dec 2011 16:18:46 +0100 Subject: [PATCH] Try to take care of FLTK external dependencies on Linux --- CMakeLists.txt | 7 +++++++ utils/fgadmin/src/CMakeLists.txt | 2 ++ 2 files changed, 9 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index cb1156a2d..a6a3194a2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/utils/fgadmin/src/CMakeLists.txt b/utils/fgadmin/src/CMakeLists.txt index 6a6c76bc4..12776ef54 100644 --- a/utils/fgadmin/src/CMakeLists.txt +++ b/utils/fgadmin/src/CMakeLists.txt @@ -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)