From f08d1971ed4786eba8c9cd41f3cb4864645c61a4 Mon Sep 17 00:00:00 2001 From: "gregory.hainaut" Date: Thu, 10 Jun 2010 07:14:53 +0000 Subject: [PATCH] [cmake]: * Fix default build option * Fix futur soundtouch include path git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3189 96395faa-99c1-11dd-bbfe-3dabce05a288 --- cmake/BuildParameters.cmake | 7 +++++-- cmake/FindSoundTouch.cmake | 5 ++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/cmake/BuildParameters.cmake b/cmake/BuildParameters.cmake index 60dabf85d7..2c599875e6 100644 --- a/cmake/BuildParameters.cmake +++ b/cmake/BuildParameters.cmake @@ -9,13 +9,16 @@ # Use zlib internal lib: -DFORCE_INTERNAL_ZLIB=TRUE #------------------------------------------------------------------------------- + #------------------------------------------------------------------------------- # if no build type is set, use Devel as default +# Note without the CMAKE_BUILD_TYPE options the value is still defined to "" +# Ensure that the value set by the User is correct to avoid some bad behavior later #------------------------------------------------------------------------------- -if(NOT DEFINED CMAKE_BUILD_TYPE) +if(NOT CMAKE_BUILD_TYPE MATCHES "Debug|Devel|Release") set(CMAKE_BUILD_TYPE Devel) message(STATUS "BuildType set to ${CMAKE_BUILD_TYPE} by default") -endif(NOT DEFINED CMAKE_BUILD_TYPE) +endif(NOT CMAKE_BUILD_TYPE MATCHES "Debug|Devel|Release") #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- diff --git a/cmake/FindSoundTouch.cmake b/cmake/FindSoundTouch.cmake index 4501e896d6..013678a09e 100644 --- a/cmake/FindSoundTouch.cmake +++ b/cmake/FindSoundTouch.cmake @@ -10,7 +10,10 @@ if(SOUNDTOUCH_INCLUDE_DIR AND SOUNDTOUCH_LIBRARIES) endif(SOUNDTOUCH_INCLUDE_DIR AND SOUNDTOUCH_LIBRARIES) # include dir -find_path(SOUNDTOUCH_INCLUDE_DIR SoundTouch.h) +find_path(SOUNDTOUCH_INCLUDE_DIR SoundTouch.h + /usr/include/soundtouch + /usr/local/include/soundtouch + ) # finally the library itself find_library(libSoundTouch NAMES SoundTouch)