mirror of
https://github.com/minetest/minetest.git
synced 2024-09-12 00:26:50 +02:00
Fix broken include check and correct Gitlab-CI script
This commit is contained in:
parent
fc1512cca6
commit
5f4c78a77d
@ -26,7 +26,7 @@ variables:
|
|||||||
- cd ..
|
- cd ..
|
||||||
- mkdir cmakebuild
|
- mkdir cmakebuild
|
||||||
- cd 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 -j2
|
||||||
- make install
|
- make install
|
||||||
artifacts:
|
artifacts:
|
||||||
|
@ -61,7 +61,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
|
|||||||
find_package(Irrlicht)
|
find_package(Irrlicht)
|
||||||
if(BUILD_CLIENT AND NOT IRRLICHT_FOUND)
|
if(BUILD_CLIENT AND NOT IRRLICHT_FOUND)
|
||||||
message(FATAL_ERROR "Irrlicht is required to build the client, but it was not 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.")
|
message(FATAL_ERROR "Irrlicht headers are required to build the server, but none found.")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user