Add property controls for cloud impostors and LoD hierarchy radii.

[flightgear.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a6a3194a2ebf1daf5572233cd2830051e4a1685c..442d95ffa3eff8b66edc8a838f713a73cca8594a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -63,7 +63,7 @@ if(NOT CMAKE_BUILD_TYPE)
       FORCE)
 endif(NOT CMAKE_BUILD_TYPE)
 
-if($ENV{BUILD_ID})
+if(NOT "$ENV{BUILD_ID}" STREQUAL "")
        set(HUDSON_BUILD_ID $ENV{BUILD_ID})
        set(HUDSON_BUILD_NUMBER $ENV{BUILD_NUMBER})
        message(STATUS "running under Hudson, build-number is ${HUDSON_BUILD_NUMBER}")
@@ -194,13 +194,23 @@ find_package(ALUT REQUIRED)
 find_package(OpenSceneGraph 3.0.0 REQUIRED osgText osgSim osgDB osgParticle osgFX osgUtil osgViewer osgGA)
 
 if(ENABLE_FGADMIN)
-  find_package(FLTK)
+       find_package(FLTK)
 
        if ( FLTK_FOUND )
+               if ( X11_Xinerama_FOUND )
+                       message(STATUS "Found X11_Xinerama...")
+                       list(APPEND FLTK_LIBRARIES ${X11_Xinerama_LIB})
+               endif()
+
+               if ( X11_Xft_FOUND )
+                       message(STATUS "Found X11_Xft...")
+                       list(APPEND FLTK_LIBRARIES ${X11_Xft_LIB})
+               endif()
 
                set( CMAKE_REQUIRED_INCLUDES ${FLTK_INCLUDE_DIR} )
-               set( CMAKE_REQUIRED_LIBRARIES ${FLTK_LIBRARIES} ${X11_Xinerama_LIB} ${X11_Xft_LIB} )
+               set( CMAKE_REQUIRED_LIBRARIES ${FLTK_LIBRARIES} )
 
+               message(STATUS "Using FLTK_LIBRARIES for fgadmin: ${FLTK_LIBRARIES}")
        endif ( FLTK_FOUND )
 endif(ENABLE_FGADMIN)
 
@@ -215,7 +225,7 @@ if(ENABLE_LIBSVN)
 endif(ENABLE_LIBSVN)
 
 find_package(PLIB REQUIRED puaux pu js fnt)
-find_package(SimGear 2.5.0 REQUIRED)
+find_package(SimGear 2.7.0 REQUIRED)
 
 if (JPEG_FACTORY)
     # check simgear was built with JPEG-factory support