From 1e0625d4ab790c056f6ff32d341c3fd7c507fa92 Mon Sep 17 00:00:00 2001 From: undef-in-ed Date: Thu, 15 Mar 2012 12:50:15 +0000 Subject: [PATCH] CMake: refactor FindIrrlicht a little bit git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10975 178a84e3-b1eb-0310-8ba1-8eac791a3b58 --- cmake/FindIrrlicht.cmake | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/cmake/FindIrrlicht.cmake b/cmake/FindIrrlicht.cmake index 44c7ffc6d..3639ebdc1 100644 --- a/cmake/FindIrrlicht.cmake +++ b/cmake/FindIrrlicht.cmake @@ -13,21 +13,6 @@ set(IRRLICHT_DIR "" CACHE PATH "Path to Irrlicht") -# Set library directories depending on system -if(APPLE) - set(IRRLICHT_LIBRARY_DIR "/Library/Frameworks/IrrFramework.framework") -elseif(CYGWIN) - # CYGWIN must be checked before "Unix" since Cygwin is a Unix - set(IRRLICHT_LIBRARY_DIR "${PROJECT_SOURCE_DIR}/dependencies/lib") -elseif(UNIX) - set(IRRLICHT_LIBRARY_DIR "${IRRLICHT_DIR}/lib/Linux") -elseif(MSVC) - set(IRRLICHT_LIBRARY_DIR "${PROJECT_SOURCE_DIR}/dependencies/lib") -else() - # mingw / cygwin - set(IRRLICHT_LIBRARY_DIR "${PROJECT_SOURCE_DIR}/dependencies/lib") -endif() - # Find include directory and library find_path(IRRLICHT_INCLUDE_DIR NAMES irrlicht.h PATHS ${IRRLICHT_DIR} @@ -36,11 +21,10 @@ find_path(IRRLICHT_INCLUDE_DIR NAMES irrlicht.h PATH_SUFFIXES include irrlicht) if(APPLE) - find_library(IRRLICHT_LIBRARY NAMES IrrFramework PATHS ${IRRLICHT_LIBRARY_DIR}) + find_library(IRRLICHT_LIBRARY NAMES IrrFramework PATHS /Library/Frameworks/IrrFramework.framework) else() - message("IRRLICHT_LIBRARY_DIR = ${IRRLICHT_LIBRARY_DIR}") - find_library(IRRLICHT_LIBRARY REQUIRED NAMES Irrlicht libIrrlicht PATHS ${IRRLICHT_LIBRARY_DIR} ${PROJECT_SOURCE_DIR}) - message("IRRLICHT_LIBRARY = ${IRRLICHT_LIBRARY}") + find_library(IRRLICHT_LIBRARY NAMES Irrlicht libIrrlicht + PATHS ${IRRLICHT_DIR}/lib/Linux ${PROJECT_SOURCE_DIR}/dependencies/lib ${PROJECT_SOURCE_DIR}) endif() # Determine Irrlicht version