From 6a26d6d15a9a122681772c29a7f3b0c36ac9c62e Mon Sep 17 00:00:00 2001
From: sfan5 <sfan5@live.de>
Date: Thu, 25 Mar 2021 15:09:49 +0100
Subject: Adjust build config for Irrlicht changes (again)
---
cmake/Modules/FindIrrlicht.cmake | 29 ++++++++++++++++++-----------
1 file changed, 18 insertions(+), 11 deletions(-)
(limited to 'cmake/Modules')
diff --git a/cmake/Modules/FindIrrlicht.cmake b/cmake/Modules/FindIrrlicht.cmake
index 8296de685..bb501b3b4 100644
--- a/cmake/Modules/FindIrrlicht.cmake
+++ b/cmake/Modules/FindIrrlicht.cmake
@@ -3,24 +3,31 @@ mark_as_advanced(IRRLICHT_LIBRARY IRRLICHT_INCLUDE_DIR IRRLICHT_DLL)
# Find include directory and libraries
-if(TRUE)
+# find our fork first, then upstream (TODO: remove this?)
+foreach(libname IN ITEMS IrrlichtMt Irrlicht)
+ string(TOLOWER "${libname}" libname2)
+
find_path(IRRLICHT_INCLUDE_DIR NAMES irrlicht.h
- DOC "Path to the directory with Irrlicht includes"
+ DOC "Path to the directory with IrrlichtMt includes"
PATHS
- /usr/local/include/irrlicht
- /usr/include/irrlicht
- /system/develop/headers/irrlicht #Haiku
- PATH_SUFFIXES "include/irrlicht"
+ /usr/local/include/${libname2}
+ /usr/include/${libname2}
+ /system/develop/headers/${libname2} #Haiku
+ PATH_SUFFIXES "include/${libname2}"
)
- find_library(IRRLICHT_LIBRARY NAMES libIrrlicht Irrlicht
- DOC "Path to the Irrlicht library file"
+ find_library(IRRLICHT_LIBRARY NAMES lib${libname} ${libname}
+ DOC "Path to the IrrlichtMt library file"
PATHS
/usr/local/lib
/usr/lib
/system/develop/lib # Haiku
)
-endif()
+
+ if(IRRLICHT_INCLUDE_DIR OR IRRLICHT_LIBRARY)
+ break()
+ endif()
+endforeach()
# Users will likely need to edit these
mark_as_advanced(CLEAR IRRLICHT_LIBRARY IRRLICHT_INCLUDE_DIR)
@@ -29,8 +36,8 @@ mark_as_advanced(CLEAR IRRLICHT_LIBRARY IRRLICHT_INCLUDE_DIR)
if(WIN32)
# If VCPKG_APPLOCAL_DEPS is ON, dll's are automatically handled by VCPKG
if(NOT VCPKG_APPLOCAL_DEPS)
- find_file(IRRLICHT_DLL NAMES Irrlicht.dll
- DOC "Path of the Irrlicht dll (for installation)"
+ find_file(IRRLICHT_DLL NAMES IrrlichtMt.dll
+ DOC "Path of the IrrlichtMt dll (for installation)"
)
endif()
endif(WIN32)
--
cgit v1.2.3