From c77161e2b087baa85371f84cb886f579f32001fe Mon Sep 17 00:00:00 2001 From: Mathias Froehlich Date: Sun, 11 Sep 2011 23:27:03 +0200 Subject: [PATCH 1/2] cmake: add quotes to string split. --- CMakeModules/FindSvnClient.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeModules/FindSvnClient.cmake b/CMakeModules/FindSvnClient.cmake index baf03027..f7d145ea 100644 --- 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") From d290fdfc5f6654ae0e14f977acc314dc9b860035 Mon Sep 17 00:00:00 2001 From: Mathias Froehlich Date: Mon, 12 Sep 2011 08:08:26 +0200 Subject: [PATCH 2/2] cmake: Use a default build type that builds fast executables. --- CMakeLists.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 381ac41c..68d8e059 100644 --- 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)