JPEG-server support, in the CMake world.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d620f565c9d03292b8d312926e1d3190dbc8602b..3ce0f265df2acc9e23a5394cebbd3ea1ab0f94e5 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,7 +40,7 @@ set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/CMakeModules;${CMAKE_MODULE_PATH}")
 if (FG_DATA_DIR)
     message(STATUS "Using explicit data-dir: ${FG_DATA_DIR}")
 else()
-    set(FG_DATA_DIR "${CMAKE_INSTALL_PREFIX}/lib/FlightGear")
+    set(FG_DATA_DIR "${CMAKE_INSTALL_PREFIX}/lib/FlightGear" CACHE PATH "Default location where data files are located")
     message(STATUS "Using default data-dir:  ${FG_DATA_DIR}")
 endif()
 
@@ -93,7 +93,7 @@ option(EVENT_INPUT "Set to ON to build FlightGear with event-based Input support
 option(ENABLE_LIBSVN "Set to ON to build FlightGear/terrasync with libsvnclient support" ON)
 option(ENABLE_RTI "Set to ON to build SimGear with RTI support" OFF)
 option(WITH_FGPANEL "Set to ON to build the fgpanel application" ON)
-
+option(JPEG_FACTORY "Enable JPEG-factory support" OFF)
 
 if (MSVC)
   GET_FILENAME_COMPONENT(PARENT_DIR ${PROJECT_SOURCE_DIR} PATH)
@@ -190,6 +190,22 @@ endif(ENABLE_LIBSVN)
 find_package(PLIB REQUIRED puaux pu js fnt)
 find_package(SimGear 2.5.0 REQUIRED)
 
+if (JPEG_FACTORY)
+    # check simgear was built with JPEG-factory support
+    find_package(JPEG REQUIRED)
+    include_directories(${JPEG_INCLUDE_DIR})
+    
+    set(CMAKE_REQUIRED_INCLUDES ${SIMGEAR_INCLUDE_DIR} ${JPEG_INCLUDE_DIR})
+    check_cxx_source_compiles(
+        "#include <simgear/screen/jpgfactory.hxx>
+        int main()    { return 0; } "
+        FG_JPEG_SERVER)
+        
+    if (NOT FG_JPEG_SERVER)
+        message(STATUS "JPEG server support requested, but SimGear was built without JPEG support")
+    endif()
+endif()
+
 check_include_file(unistd.h HAVE_UNISTD_H)
 check_include_file(sys/time.h HAVE_SYS_TIME_H)
 check_include_file(windows.h HAVE_WINDOWS_H)

diff --git a/src/Include/config_cmake.h.in b/src/Include/config_cmake.h.in
index 2b96a50c75c9195c20813927ef2a00472cfd78f1..23af01f2f6284b6fc13c4bd8d56dc249718691d3 100644 (file)
--- a/src/Include/config_cmake.h.in
+++ b/src/Include/config_cmake.h.in
@@ -36,3 +36,4 @@
 #define PKGLIBDIR "@FG_DATA_DIR@"
 
 #cmakedefine FG_HAVE_HLA
+#cmakedefine FG_JPEG_SERVER

diff --git a/src/Main/CMakeLists.txt b/src/Main/CMakeLists.txt
index 16a84267cb130915f8fa8f83ac6a56a202b455dd..e3e06aa8c323cc16aed0c32f38bcd1071d6841af 100644 (file)
--- a/src/Main/CMakeLists.txt
+++ b/src/Main/CMakeLists.txt
@@ -77,6 +77,7 @@ target_link_libraries(fgfs
        ${OPENAL_LIBRARY}
        ${OPENGL_LIBRARIES}
        ${PLIB_LIBRARIES}
+       ${JPEG_LIBRARY}
        ${LIBSVN_LIBRARIES}
        ${HLA_LIBRARIES}
        ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}