ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[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
This commit is contained in:
gregory.hainaut 2010-06-10 07:14:53 +00:00
parent ff1db14f9d
commit f08d1971ed
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmake/BuildParameters.cmake
View File

@ -9,13 +9,16 @@
# Use zlib internal lib: -DFORCE_INTERNAL_ZLIB=TRUE # Use zlib internal lib: -DFORCE_INTERNAL_ZLIB=TRUE
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# if no build type is set, use Devel as default # 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) set(CMAKE_BUILD_TYPE Devel)
message(STATUS "BuildType set to ${CMAKE_BUILD_TYPE} by default") 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")
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------

5
cmake/FindSoundTouch.cmake
View File

@ -10,7 +10,10 @@ if(SOUNDTOUCH_INCLUDE_DIR AND SOUNDTOUCH_LIBRARIES)
endif(SOUNDTOUCH_INCLUDE_DIR AND SOUNDTOUCH_LIBRARIES) endif(SOUNDTOUCH_INCLUDE_DIR AND SOUNDTOUCH_LIBRARIES)
# include dir # 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 # finally the library itself
find_library(libSoundTouch NAMES SoundTouch) find_library(libSoundTouch NAMES SoundTouch)