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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6e356fbec..1952d7c86 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,9 +33,11 @@ if(EXISTS ${PROJECT_SOURCE_DIR}/.gitignore)
 else()
     # clean tar-balls do not contain SCM (.git/.gitignore/...) files.
     set(CPACK_SOURCE_IGNORE_FILES
-      "^${PROJECT_SOURCE_DIR}/.git;\\\\.gitignore;Makefile.am;~$;${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} )
 set(CPACK_PACKAGE_VERSION_MAJOR ${CMAKE_MATCH_1}) 
@@ -44,7 +46,7 @@ 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")
 
-set(CPACK_SOURCE_GENERATOR TBZ2 ZIP)
+set(CPACK_SOURCE_GENERATOR TBZ2)
 set(CPACK_SOURCE_PACKAGE_FILE_NAME "flightgear-${FLIGHTGEAR_VERSION}" CACHE INTERNAL "tarball basename")
 
 include (CPack)
@@ -63,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}")
@@ -194,7 +196,24 @@ 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} )
+
+		message(STATUS "Using FLTK_LIBRARIES for fgadmin: ${FLTK_LIBRARIES}")
+	endif ( FLTK_FOUND )
 endif(ENABLE_FGADMIN)
 
 if(ENABLE_LIBSVN)
@@ -208,7 +227,9 @@ 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
@@ -283,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} )