- The root CMakeLists.txt now explicitly sets the build type to Debug if you

don't tell it otherwise.
- src/CMakeLists.txt now searches for fmod.hpp instead of fmod.h.

SVN r1260 (trunk)
This commit is contained in:
Randy Heit 2008-10-14 01:28:04 +00:00
parent cb159b26c2
commit 86e650207d
2 changed files with 7 additions and 1 deletions

View file

@ -1,5 +1,11 @@
cmake_minimum_required( VERSION 2.4 ) cmake_minimum_required( VERSION 2.4 )
IF( NOT CMAKE_BUILD_TYPE )
SET( CMAKE_BUILD_TYPE Debug CACHE STRING
"Choose the type of build, options are: Debug Release RelWithDebInfo MinSizeRel."
FORCE )
ENDIF( NOT CMAKE_BUILD_TYPE )
set( ZDOOM_OUTPUT_DIR ${CMAKE_BINARY_DIR} CACHE PATH "Directory where zdoom.pk3 and the executable will be created" ) set( ZDOOM_OUTPUT_DIR ${CMAKE_BINARY_DIR} CACHE PATH "Directory where zdoom.pk3 and the executable will be created" )
set( ZDOOM_EXE_NAME "zdoom" CACHE FILEPATH "Name of the executable to create" ) set( ZDOOM_EXE_NAME "zdoom" CACHE FILEPATH "Name of the executable to create" )

View file

@ -141,7 +141,7 @@ endif( NOT FMOD_LIB_NAME )
# Search for FMOD include files # Search for FMOD include files
find_path( FMOD_INCLUDE_DIR fmod.h find_path( FMOD_INCLUDE_DIR fmod.hpp
PATHS ${FMOD_SEARCH_PATHS} PATHS ${FMOD_SEARCH_PATHS}
${FMOD_INC_PATH_SUFFIXES} ) ${FMOD_INC_PATH_SUFFIXES} )