uh, i guess this now merges the new delta stuff?

[dragonfireclient.git] / cmake / Modules / FindIrrlicht.cmake

diff --git a/cmake/Modules/FindIrrlicht.cmake b/cmake/Modules/FindIrrlicht.cmake
index 01e7088c9fb0f7ed3bc524050fbab9251b3c0a97..bd00422629ff388560d2a15db236988e2f35a515 100644 (file)
--- a/cmake/Modules/FindIrrlicht.cmake
+++ b/cmake/Modules/FindIrrlicht.cmake
@@ -14,28 +14,50 @@ if(NOT IRRLICHT_SOURCE_DIR STREQUAL "")
        set(IRRLICHT_SOURCE_DIR_INCLUDE
                "${IRRLICHT_SOURCE_DIR}/include"
        )
-       set(IRRLICHT_SOURCE_DIR_LIBS
-               "${IRRLICHT_SOURCE_DIR}/lib/Win32-visualstudio"
-               "${IRRLICHT_SOURCE_DIR}/lib/Win32-gcc"
+
+       set(IRRLICHT_LIBRARY_NAMES libIrrlicht.a Irrlicht Irrlicht.lib)
+
+       if(WIN32)
+               if(MSVC)
+                       set(IRRLICHT_SOURCE_DIR_LIBS "${IRRLICHT_SOURCE_DIR}/lib/Win32-visualstudio")
+                       set(IRRLICHT_LIBRARY_NAMES Irrlicht.lib)
+               else()
+                       set(IRRLICHT_SOURCE_DIR_LIBS "${IRRLICHT_SOURCE_DIR}/lib/Win32-gcc")
+                       set(IRRLICHT_LIBRARY_NAMES libIrrlicht.a libIrrlicht.dll.a)
+               endif()
+       else()
+               set(IRRLICHT_SOURCE_DIR_LIBS "${IRRLICHT_SOURCE_DIR}/lib/Linux")
+               set(IRRLICHT_LIBRARY_NAMES libIrrlicht.a)
+       endif()
+
+       FIND_PATH(IRRLICHT_INCLUDE_DIR NAMES irrlicht.h
+               PATHS
+               ${IRRLICHT_SOURCE_DIR_INCLUDE}
+               NO_DEFAULT_PATH
        )
-endif()
 
-FIND_PATH(IRRLICHT_INCLUDE_DIR NAMES irrlicht.h
-       PATHS
-       "${IRRLICHT_SOURCE_DIR_INCLUDE}"
-       /usr/local/include/irrlicht
-       /usr/include/irrlicht
-)
+       FIND_LIBRARY(IRRLICHT_LIBRARY NAMES ${IRRLICHT_LIBRARY_NAMES}
+               PATHS
+               ${IRRLICHT_SOURCE_DIR_LIBS}
+               NO_DEFAULT_PATH
+       )
+
+else()
 
-# Find library directory
+       FIND_PATH(IRRLICHT_INCLUDE_DIR NAMES irrlicht.h
+               PATHS
+               /usr/local/include/irrlicht
+               /usr/include/irrlicht
+       )
 
-FIND_LIBRARY(IRRLICHT_LIBRARY NAMES libIrrlicht.a Irrlicht
-       PATHS
-       "${IRRLICHT_SOURCE_DIR_LIBS}"
-       /usr/local/lib
-       /usr/lib
-)
+       FIND_LIBRARY(IRRLICHT_LIBRARY NAMES libIrrlicht.a Irrlicht
+               PATHS
+               /usr/local/lib
+               /usr/lib
+       )
+endif()
 
+MESSAGE(STATUS "IRRLICHT_SOURCE_DIR = ${IRRLICHT_SOURCE_DIR}")
 MESSAGE(STATUS "IRRLICHT_INCLUDE_DIR = ${IRRLICHT_INCLUDE_DIR}")
 MESSAGE(STATUS "IRRLICHT_LIBRARY = ${IRRLICHT_LIBRARY}")