aboutsummaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorMarkus Koschany <apo@gambaru.de>2015-02-21 17:46:33 +0100
committerLoic Blot <loic.blot@unix-experience.fr>2015-02-21 18:21:10 +0100
commit47d9b4d9aa80e0268501b8eb927b37ee3660c503 (patch)
treeb3790bac459e92c97eb4e3cd50cb713f485dce58 /cmake
parentc5defe7a11f58048acfa4568ea784f31d9ffa276 (diff)
downloadminetest-47d9b4d9aa80e0268501b8eb927b37ee3660c503.tar.gz
minetest-47d9b4d9aa80e0268501b8eb927b37ee3660c503.tar.bz2
minetest-47d9b4d9aa80e0268501b8eb927b37ee3660c503.zip
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
Diffstat (limited to 'cmake')
-rw-r--r--cmake/Modules/FindIrrlicht.cmake2
1 files changed, 1 insertions, 1 deletions
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