From: Markus Koschany <apo@gambaru.de>
Date: Sat, 21 Feb 2015 16:46:33 +0000 (+0100)
Subject: Improve FindIrrlicht.cmake module
X-Git-Tag: 0.4.13~571
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=47d9b4d9aa80e0268501b8eb927b37ee3660c503;p=oweals%2Fminetest.git

Improve FindIrrlicht.cmake module

Linux distributions prefer to link against a shared version of the Irrlicht
engine instead of using embedded code copies of the same. Search for this
shared version first and use that but fall back to the static version if it
does not exist.

This also fixes https://github.com/minetest/minetest/issues/2163
---

diff --git a/cmake/Modules/FindIrrlicht.cmake b/cmake/Modules/FindIrrlicht.cmake
index dce78fbaa..a84765d4e 100644
--- a/cmake/Modules/FindIrrlicht.cmake
+++ b/cmake/Modules/FindIrrlicht.cmake
@@ -44,7 +44,7 @@ else()
 		/usr/include/irrlicht
 	)
 
-	FIND_LIBRARY(IRRLICHT_LIBRARY NAMES libIrrlicht.a Irrlicht
+	FIND_LIBRARY(IRRLICHT_LIBRARY NAMES libIrrlicht.so libIrrlicht.a Irrlicht
 		PATHS
 		/usr/local/lib
 		/usr/lib