From 16a30556dfa8e27c82d026bd63467f82d2e37a1c Mon Sep 17 00:00:00 2001 From: sfan5 Date: Sun, 22 May 2022 00:52:11 +0200 Subject: Formally drop support for building with upstream Irrlicht It stopped working with (at least) the last commit. --- cmake/Modules/MinetestFindIrrlichtHeaders.cmake | 26 +++++++++---------------- 1 file changed, 9 insertions(+), 17 deletions(-) (limited to 'cmake') diff --git a/cmake/Modules/MinetestFindIrrlichtHeaders.cmake b/cmake/Modules/MinetestFindIrrlichtHeaders.cmake index d33b296d0..e434b582f 100644 --- a/cmake/Modules/MinetestFindIrrlichtHeaders.cmake +++ b/cmake/Modules/MinetestFindIrrlichtHeaders.cmake @@ -1,21 +1,13 @@ -# Locate Irrlicht or IrrlichtMt headers on system. +# Locate IrrlichtMt headers on system. -foreach(libname IN ITEMS IrrlichtMt Irrlicht) - string(TOLOWER "${libname}" libname2) - - find_path(IRRLICHT_INCLUDE_DIR NAMES irrlicht.h - DOC "Path to the directory with IrrlichtMt includes" - PATHS - /usr/local/include/${libname2} - /usr/include/${libname2} - /system/develop/headers/${libname2} #Haiku - PATH_SUFFIXES "include/${libname2}" - ) - - if(IRRLICHT_INCLUDE_DIR) - break() - endif() -endforeach() +find_path(IRRLICHT_INCLUDE_DIR NAMES irrlicht.h + DOC "Path to the directory with IrrlichtMt includes" + PATHS + /usr/local/include/irrlichtmt + /usr/include/irrlichtmt + /system/develop/headers/irrlichtmt #Haiku + PATH_SUFFIXES "include/irrlichtmt" +) # Handholding for users if(IRRLICHT_INCLUDE_DIR AND (NOT IS_DIRECTORY "${IRRLICHT_INCLUDE_DIR}" OR -- cgit v1.2.3