From 56320f7e8de3cf31cbaf11492528016c4446d8f4 Mon Sep 17 00:00:00 2001
From: Perttu Ahola <celeron55@gmail.com>
Date: Tue, 1 Feb 2011 10:45:55 +0200
Subject: [PATCH] Hopefully fixed the problem of IRRLICHT_SOURCE_DIR being not
considered when a local version of irrlicht is found.
---
cmake/Modules/FindIrrlicht.cmake | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/cmake/Modules/FindIrrlicht.cmake b/cmake/Modules/FindIrrlicht.cmake
index 246e72cfb..01e7088c9 100644
--- a/cmake/Modules/FindIrrlicht.cmake
+++ b/cmake/Modules/FindIrrlicht.cmake
@@ -10,22 +10,30 @@ endif( UNIX )
# Find include directory
+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"
+ )
+endif()
+
FIND_PATH(IRRLICHT_INCLUDE_DIR NAMES irrlicht.h
PATHS
+ "${IRRLICHT_SOURCE_DIR_INCLUDE}"
/usr/local/include/irrlicht
/usr/include/irrlicht
- "${IRRLICHT_SOURCE_DIR}/include"
)
# Find library directory
FIND_LIBRARY(IRRLICHT_LIBRARY NAMES libIrrlicht.a Irrlicht
PATHS
+ "${IRRLICHT_SOURCE_DIR_LIBS}"
/usr/local/lib
/usr/lib
- #${IRRLICHT_PLATFORM_DIR}
- "${IRRLICHT_SOURCE_DIR}/lib/Win32-visualstudio"
- "${IRRLICHT_SOURCE_DIR}/lib/Win32-gcc"
)
MESSAGE(STATUS "IRRLICHT_INCLUDE_DIR = ${IRRLICHT_INCLUDE_DIR}")
--
GitLab