Fix broken include check and correct Gitlab-CI script

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9764648e112c3ddb183f787053b215d83bf05361..5e16cdfe50920f45d5133fac0137c79f16caaf2a 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,7 +26,7 @@ variables:
     - cd ..
     - mkdir cmakebuild
     - cd cmakebuild
-    - cmake -DIRRLICHT_LIBRARY=$PWD/../irrlicht/lib/Linux/libIrrlicht.a -DIRRLICHT_INCLUDE_DIR=$PWD/../irrlicht/include -DCMAKE_INSTALL_PREFIX=../artifact/minetest/usr/ -DCMAKE_BUILD_TYPE=Release -DRUN_IN_PLACE=FALSE -DENABLE_GETTEXT=TRUE -DBUILD_SERVER=TRUE ..
+    - cmake -DIRRLICHT_LIBRARY=$PWD/../irrlicht/lib/Linux/libIrrlichtMt.a -DIRRLICHT_INCLUDE_DIR=$PWD/../irrlicht/include -DCMAKE_INSTALL_PREFIX=../artifact/minetest/usr/ -DCMAKE_BUILD_TYPE=Release -DRUN_IN_PLACE=FALSE -DENABLE_GETTEXT=TRUE -DBUILD_SERVER=TRUE ..
     - make -j2
     - make install
   artifacts:

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e4bda3afbec8a990314a33c3ff6455aff3308141..c46ff6c778c634aecaaea11315502aa976d7830b 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -61,7 +61,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
 find_package(Irrlicht)
 if(BUILD_CLIENT AND NOT IRRLICHT_FOUND)
        message(FATAL_ERROR "Irrlicht is required to build the client, but it was not found.")
-elseif(IRRLICHT_INCLUDE_DIR STREQUAL "")
+elseif(NOT IRRLICHT_INCLUDE_DIR)
        message(FATAL_ERROR "Irrlicht headers are required to build the server, but none found.")
 endif()