Merge branch 'next' of git.gitorious.org:fg/simgear into next

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2515c559164ce009a6c63705b72959bed656cf7f..77431bd381eb11159858d5e507fe76d36045fb99 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,6 +29,13 @@ message(STATUS "version is ${CPACK_PACKAGE_VERSION_MAJOR} dot ${CPACK_PACKAGE_VE
 # We have some custom .cmake scripts not in the official distribution.
 set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/CMakeModules;${CMAKE_MODULE_PATH}")
 
+# Change the default build type to something fast
+if(NOT CMAKE_BUILD_TYPE)
+  set(CMAKE_BUILD_TYPE Release CACHE STRING
+      "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel."
+      FORCE)
+endif(NOT CMAKE_BUILD_TYPE)
+
 option(SIMGEAR_SHARED "Set to ON to build SimGear as a shared library/framework" OFF)
 option(SIMGEAR_HEADLESS "Set to ON to build SimGear without GUI/graphics support" OFF)
 option(JPEG_FACTORY "Enable JPEG-factory support" OFF)

diff --git a/CMakeModules/FindSvnClient.cmake b/CMakeModules/FindSvnClient.cmake
index baf03027e3dce103f9f0d43c2e4a8d4bae5f028d..f7d145ea80d107fbabd8a68b11c99ba19f4d73ad 100644 (file)
--- a/CMakeModules/FindSvnClient.cmake
+++ b/CMakeModules/FindSvnClient.cmake
@@ -16,7 +16,7 @@ if(HAVE_APR_CONFIG)
         OUTPUT_STRIP_TRAILING_WHITESPACE)
     
 # clean up some vars, or other CMake pieces complain
-       string(STRIP ${RAW_APR_LIBS} APR_LIBS)
+       string(STRIP "${RAW_APR_LIBS}" APR_LIBS)
 
 else(HAVE_APR_CONFIG)
     message(STATUS "apr-1-config not found, implement manual search for APR")