#348: (continued) Missing sound files not reported properly

[simgear.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8b3e653616769635b377117f5a7430af30491ebd..9374a3eef50916a8fb27b3c70237384f29de14e1 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,9 @@ include (CPack)
 
 project(SimGear)
 
-set(SIMGEAR_VERSION "2.2.0")
+# read 'version' file into a variable (stripping any newlines or spaces)
+file(READ version versionFile)
+string(STRIP ${versionFile} SIMGEAR_VERSION)
 
 #packaging
 SET(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/COPYING")
@@ -18,9 +20,11 @@ set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/CMakeModules;${CMAKE_MODULE_PATH}")
 option(SIMGEAR_SHARED "Set to ON to build SimGear as a shared library/framework" OFF)
 option(SIMGEAR_HEADLESS "Set to ON to build SimGear with GUI/graphics support" OFF)
 option(JPEG_FACTORY "Enable JPEG-factory support" OFF)
+option(ENABLE_LIBSVN "Set to ON to build SimGear with libsvnclient support" OFF)
+
 set(MSVC_3RDPARTY_ROOT NOT_FOUND CACHE PATH "Location where the third-party dependencies are extracted")
 
-if (MSVC_3RDPARTY_ROOT)
+if (MSVC AND MSVC_3RDPARTY_ROOT)
   message(STATUS "3rdparty files located in ${MSVC_3RDPARTY_ROOT}")
   set( OSG_MSVC "msvc" )
   if (${MSVC_VERSION} EQUAL 1600)
@@ -41,7 +45,7 @@ if (MSVC_3RDPARTY_ROOT)
   set (OPENAL_INCLUDE_DIR ${MSVC_3RDPARTY_ROOT}/${MSVC_3RDPARTY_DIR}/include)
   set (ALUT_INCLUDE_DIR ${MSVC_3RDPARTY_ROOT}/${MSVC_3RDPARTY_DIR}/include)
   set (OPENAL_LIBRARY_DIR ${MSVC_3RDPARTY_ROOT}/${MSVC_3RDPARTY_DIR}/lib) 
-endif (MSVC_3RDPARTY_ROOT)
+endif (MSVC AND MSVC_3RDPARTY_ROOT)
 
 find_package(Boost REQUIRED)
 set (BOOST_CXX_FLAGS "-DBOOST_MULTI_INDEX_DISABLE_SERIALIZATION -DBOOST_BIMAP_DISABLE_SERIALIZATION")
@@ -65,6 +69,16 @@ if(JPEG_FACTORY)
     include_directories(${JPEG_INCLUDE_DIR})
 endif()
 
+if(ENABLE_LIBSVN)
+       find_package(SvnClient)
+       
+       if(LIBSVN_FOUND)
+               message(STATUS "libsvn found, enabling in SimGear")
+               set(HAVE_SVN_CLIENT_H 1)
+               set(HAVE_LIBSVN_CLIENT_1 1)
+       endif(LIBSVN_FOUND)
+endif(ENABLE_LIBSVN)
+
 check_include_file(sys/time.h HAVE_SYS_TIME_H)
 check_include_file(sys/timeb.h HAVE_SYS_TIMEB_H)
 check_include_file(unistd.h HAVE_UNISTD_H)