X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=CMakeLists.txt;h=1952d7c86ee47ab9aab2e5fddf8da6d3690abba4;hb=dd3afd4c4e66d822d984a07de26b03083309fb9d;hp=e1a6dcc7cc62b45ebf13b87dbc331e415a93823b;hpb=3a757324884d1d6f89aa2c6f106fc22b99570df4;p=flightgear.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e1a6dcc7c..1952d7c86 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,20 +4,39 @@ include (CheckFunctionExists)
 include (CheckCSourceCompiles)
 include (CheckCXXSourceCompiles)
 include (CheckIncludeFile)
-include (CPack)
 
 project(FlightGear)
 
+# We have some custom .cmake scripts not in the official distribution.
+set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/CMakeModules;${CMAKE_MODULE_PATH}")
+
+if(${CMAKE_VERSION} VERSION_GREATER 2.8.4)
+    # use official include provided by latest CMake
+    include(GNUInstallDirs)
+else(${CMAKE_VERSION} VERSION_GREATER 2.8.4)
+    # backward compatibility: use our own module for older cmake versions
+    include(OldGNUInstallDirs)
+endif(${CMAKE_VERSION} VERSION_GREATER 2.8.4)
+
 set(CMAKE_DEBUG_POSTFIX "d" CACHE STRING "add a postfix, usually d on windows")
 set(CMAKE_RELEASE_POSTFIX "" CACHE STRING "add a postfix, usually empty on windows")
-set(CMAKE_RELWITHDEBINFO_POSTFIX "rd" CACHE STRING "add a postfix, usually empty on windows")
-set(CMAKE_MINSIZEREL_POSTFIX "s" CACHE STRING "add a postfix, usually empty on windows")
+set(CMAKE_RELWITHDEBINFO_POSTFIX "" CACHE STRING "add a postfix, usually empty on windows")
+set(CMAKE_MINSIZEREL_POSTFIX "" CACHE STRING "add a postfix, usually empty on windows")
 
 # read 'version' file into a variable (stripping any newlines or spaces)
 file(READ version versionFile)
 string(STRIP ${versionFile} FLIGHTGEAR_VERSION) 
 
 #packaging
+if(EXISTS ${PROJECT_SOURCE_DIR}/.gitignore)
+    file(READ .gitignore CPACK_SOURCE_IGNORE_FILES)
+else()
+    # clean tar-balls do not contain SCM (.git/.gitignore/...) files.
+    set(CPACK_SOURCE_IGNORE_FILES
+      "Makefile.am;~$;${CPACK_SOURCE_IGNORE_FILES}")
+endif()
+
+list (APPEND CPACK_SOURCE_IGNORE_FILES "${PROJECT_SOURCE_DIR}/.git;\\\\.gitignore")
 
 # split version string into components, note CMAKE_MATCH_0 is the entire regexp match
 string(REGEX MATCH "([0-9]+)\\.([0-9]+)\\.([0-9]+)" CPACK_PACKAGE_VERSION ${FLIGHTGEAR_VERSION} )
@@ -27,11 +46,17 @@ set(CPACK_PACKAGE_VERSION_PATCH ${CMAKE_MATCH_3})
 SET(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/COPYING")
 SET(CPACK_RESOURCE_FILE_README "${PROJECT_SOURCE_DIR}/README")
 
-# We have some custom .cmake scripts not in the official distribution.
-set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/CMakeModules;${CMAKE_MODULE_PATH}")
+set(CPACK_SOURCE_GENERATOR TBZ2)
+set(CPACK_SOURCE_PACKAGE_FILE_NAME "flightgear-${FLIGHTGEAR_VERSION}" CACHE INTERNAL "tarball basename")
+
+include (CPack)
 
-# autoconf compatibility
-set(PKGLIBDIR "foo")
+if (FG_DATA_DIR)
+    message(STATUS "Using explicit data-dir: ${FG_DATA_DIR}")
+else()
+    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()
 
 # Change the default build type to something fast
 if(NOT CMAKE_BUILD_TYPE)
@@ -40,7 +65,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}")
@@ -51,8 +76,17 @@ endif()
 
 IF(APPLE)
     set(EVENT_INPUT_DEFAULT 1)
+    
+    find_library(CORESERVICES_LIBRARY CoreServices)
+    find_library(COCOA_LIBRARY Cocoa)
+    list(APPEND PLATFORM_LIBS ${COCOA_LIBRARY} ${CORESERVICES_LIBRARY})
+
 elseif(CMAKE_SYSTEM_NAME MATCHES "Linux")
-    set(EVENT_INPUT_DEFAULT 1)
+	find_package(UDev)
+
+	if(UDEV_FOUND)
+		set(EVENT_INPUT_DEFAULT 1)
+	endif(UDEV_FOUND)
 endif()
 
 find_package(Git)
@@ -68,8 +102,8 @@ endif()
 option(LOGGING "Set to OFF to build FlightGear without logging" ON)
 
 option(SP_FDMS "Set to ON to build FlightGear with special-purpose FDMs" OFF)
-option(ENABLE_UIUC_MODEL "Set to ON to build FlightGear with UIUCModel FDM" ON)
-option(ENABLE_LARCSIM "Set to ON to build FlightGear with LaRCsim FDM" ON)
+option(ENABLE_UIUC_MODEL "Set to ON to build FlightGear with UIUCModel FDM" OFF)
+option(ENABLE_LARCSIM "Set to ON to build FlightGear with LaRCsim FDM" OFF)
 option(ENABLE_YASIM "Set to ON to build FlightGear with YASIM FDM" ON)
 option(ENABLE_JSBSIM "Set to ON to build FlightGear with JSBSim FDM" ON)
 option(ENABLE_FGADMIN "Set to ON to build FlightGear with FGADMIN" ON)
@@ -77,6 +111,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)
@@ -90,6 +125,7 @@ if (MSVC)
   else (EXISTS ${TEST_3RDPARTY_DIR})
     set(MSVC_3RDPARTY_ROOT NOT_FOUND CACHE PATH "Location where the third-party dependencies are extracted")
   endif (EXISTS ${TEST_3RDPARTY_DIR})
+  list(APPEND PLATFORM_LIBS "winmm.lib")
 else (MSVC)
   set(MSVC_3RDPARTY_ROOT NOT_FOUND CACHE PATH "Location where the third-party dependencies are extracted")
 endif (MSVC)
@@ -129,19 +165,23 @@ endif (MSVC AND MSVC_3RDPARTY_ROOT)
 
 if(EVENT_INPUT)
 	message(STATUS "checking event-based Input")
-	
+
 	IF(APPLE)
 
 	elseif(CMAKE_SYSTEM_NAME MATCHES "Linux")
-        find_package(DBus)
-        if(NOT DBUS_FOUND)
-            message(WARNING "DBus not found, event input will be disabled")
-            set(EVENT_INPUT 0)
-        endif()
-        
+		if(NOT UDEV_FOUND)
+			message(WARNING "UDev not found, event input is disabled!")
+			set(EVENT_INPUT 0)
+		else()
+			set(EVENT_INPUT_LIBRARIES ${UDEV_LIBRARIES})
+		endif()
+
 	else()
 		message(WARNING "event input is not supported on this platform yet")
 	endif()
+
+	# Keep PLIB INPUT enabled as long as EventInput does not replace current joystick configurations.
+	set(ENABLE_PLIB_JOYSTICK 1)
 else(EVENT_INPUT)
 	set(ENABLE_PLIB_JOYSTICK 1)
 endif(EVENT_INPUT)
@@ -153,10 +193,27 @@ find_package(Threads REQUIRED)
 find_package(OpenGL REQUIRED)
 find_package(OpenAL REQUIRED)
 find_package(ALUT REQUIRED)
-find_package(OpenSceneGraph 2.8.1 REQUIRED osgText osgSim osgDB osgParticle osgFX osgUtil osgViewer osgGA)
+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} )
+
+		message(STATUS "Using FLTK_LIBRARIES for fgadmin: ${FLTK_LIBRARIES}")
+	endif ( FLTK_FOUND )
 endif(ENABLE_FGADMIN)
 
 if(ENABLE_LIBSVN)
@@ -170,7 +227,29 @@ if(ENABLE_LIBSVN)
 endif(ENABLE_LIBSVN)
 
 find_package(PLIB REQUIRED puaux pu js fnt)
-find_package(SimGear 2.5.0 REQUIRED)
+
+# FlightGear and SimGear versions need to match
+find_package(SimGear ${FLIGHTGEAR_VERSION} 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} 
+        ${OPENSCENEGRAPH_INCLUDE_DIRS})
+        
+    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)
@@ -225,6 +304,7 @@ include_directories(${OPENSCENEGRAPH_INCLUDE_DIRS}
 	${Boost_INCLUDE_DIRS}
 	${ZLIB_INCLUDE_DIR}
 	${ALUT_INCLUDE_DIR}
+	${OPENGL_INCLUDE_DIR}
 	${OPENAL_INCLUDE_DIR}
 	${SIMGEAR_INCLUDE_DIR}
 	${PLIB_INCLUDE_DIR} )
@@ -255,6 +335,16 @@ configure_file (
 
 add_subdirectory(src)
 add_subdirectory(utils)
+add_subdirectory(man)
+
+set (INSTALL_DOCS 
+	README
+	README.OpenAL
+	README.plib
+	README.OSG
+	README.SimGear)
+
+INSTALL(FILES ${INSTALL_DOCS} DESTINATION ${CMAKE_INSTALL_DOCDIR} OPTIONAL)
 
 #-----------------------------------------------------------------------------
 ### uninstall target