diff options
| author | sfan5 <sfan5@live.de> | 2021-03-26 23:08:39 +0100 |
|---|---|---|
| committer | sfan5 <sfan5@live.de> | 2021-03-26 23:12:19 +0100 |
| commit | 5f4c78a77d99834887a714944899df92a4ebb573 (patch) | |
| tree | 372b7c3d9a849c9b22f890ea601699eeb4212b2e | |
| parent | fc1512cca64ca9e44ed60372355a0cf1f7b2fe09 (diff) | |
| download | minetest-5f4c78a77d99834887a714944899df92a4ebb573.tar.gz minetest-5f4c78a77d99834887a714944899df92a4ebb573.tar.bz2 minetest-5f4c78a77d99834887a714944899df92a4ebb573.zip | |
Fix broken include check and correct Gitlab-CI script
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | CMakeLists.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9764648e1..5e16cdfe5 100644 --- 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 e4bda3afb..c46ff6c77 100644 --- 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() |