From: Neal Gompa Date: Fri, 14 May 2010 00:10:27 +0000 (-0500) Subject: Fixed CMake detection of internal libs X-Git-Url: https://git.jsancho.org/?a=commitdiff_plain;h=24b1863b57a5f4165fcacbdd846844ba19b0ad5d;p=lugaru.git Fixed CMake detection of internal libs --- diff --git a/CMakeLists.txt b/CMakeLists.txt index ad651c9..2a0a66a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,10 +5,10 @@ cmake_minimum_required(VERSION 2.6) set(SRCDIR "${CMAKE_CURRENT_SOURCE_DIR}/Source") set(DEPDIR "${CMAKE_CURRENT_SOURCE_DIR}/Dependencies") -if(NOT CMAKE_BUILD_TYPE) - set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING - "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel" - FORCE) +if(NOT CMAKE_BUILD_TYPE) + set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING + "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel" + FORCE) endif(NOT CMAKE_BUILD_TYPE) if(NOT LUGARU_INSTALL_PREFIX) @@ -162,7 +162,7 @@ if (NOT OPENAL_FOUND) set(OPENAL_INCLUDE_DIR "${OPENALDIR}/include/AL") set(OPENAL_LIBRARY "") - if (WINDOWS) + if (WIN32) set(LUGARU_HAS_INTERNAL_OPENAL True) # if (MSVC) # !!! FIXME: package MSVC .dll and .lib for Windows? # set(OPENAL_LIBRARY @@ -174,7 +174,7 @@ if (NOT OPENAL_FOUND) ${OPENALDIR}/lib/win32/mingw/libOpenAL32.dll.a ) endif (MINGW) - endif(WINDOWS) + endif(WIN32) if (NOT LUGARU_HAS_INTERNAL_OPENAL) message(ERROR "We don't have a prebuilt OpenAL for this platform.") @@ -202,7 +202,7 @@ if (NOT SDL_FOUND) ) endif (APPLE) - if (WINDOWS) + if (WIN32) set(LUGARU_HAS_INTERNAL_SDL True) if (MSVC) set(SDL_LIBRARY @@ -216,7 +216,7 @@ if (NOT SDL_FOUND) ${SDLDIR}/lib/win32/mingw/libSDLmain.a ) endif (MINGW) - endif (WINDOWS) + endif (WIN32) if (NOT LUGARU_HAS_INTERNAL_SDL) message(ERROR "We don't have a prebuilt SDL for this platform.")