mirror of
https://github.com/minetest/minetest.git
synced 2024-08-19 04:54:18 +02:00
Add variable to use existing IrrlichtMt build (#11656)
Co-authored-by: SmallJoker <SmallJoker@users.noreply.github.com>
This commit is contained in:
parent
0b95da7ad3
commit
38ba813c55
@ -52,7 +52,6 @@ set(BUILD_CLIENT TRUE CACHE BOOL "Build client")
|
|||||||
set(BUILD_SERVER FALSE CACHE BOOL "Build server")
|
set(BUILD_SERVER FALSE CACHE BOOL "Build server")
|
||||||
set(BUILD_UNITTESTS TRUE CACHE BOOL "Build unittests")
|
set(BUILD_UNITTESTS TRUE CACHE BOOL "Build unittests")
|
||||||
|
|
||||||
|
|
||||||
set(WARN_ALL TRUE CACHE BOOL "Enable -Wall for Release build")
|
set(WARN_ALL TRUE CACHE BOOL "Enable -Wall for Release build")
|
||||||
|
|
||||||
if(NOT CMAKE_BUILD_TYPE)
|
if(NOT CMAKE_BUILD_TYPE)
|
||||||
@ -64,8 +63,21 @@ endif()
|
|||||||
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
|
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
|
||||||
|
|
||||||
|
|
||||||
|
set(IRRLICHTMT_BUILD_DIR "" CACHE PATH "Path to IrrlichtMt build directory.")
|
||||||
|
if(NOT "${IRRLICHTMT_BUILD_DIR}" STREQUAL "")
|
||||||
|
find_package(IrrlichtMt QUIET
|
||||||
|
PATHS "${IRRLICHTMT_BUILD_DIR}"
|
||||||
|
NO_DEFAULT_PATH
|
||||||
|
)
|
||||||
|
|
||||||
|
if(NOT TARGET IrrlichtMt::IrrlichtMt)
|
||||||
|
# find_package() searches certain subdirectories. ${PATH}/cmake is not
|
||||||
|
# the only one, but it is the one where IrrlichtMt is supposed to export
|
||||||
|
# IrrlichtMtConfig.cmake
|
||||||
|
message(FATAL_ERROR "Could not find IrrlichtMtConfig.cmake in ${IRRLICHTMT_BUILD_DIR}/cmake.")
|
||||||
|
endif()
|
||||||
# This is done here so that relative search paths are more reasonable
|
# This is done here so that relative search paths are more reasonable
|
||||||
if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/lib/irrlichtmt")
|
elseif(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/lib/irrlichtmt")
|
||||||
message(STATUS "Using user-provided IrrlichtMt at subdirectory 'lib/irrlichtmt'")
|
message(STATUS "Using user-provided IrrlichtMt at subdirectory 'lib/irrlichtmt'")
|
||||||
if(BUILD_CLIENT)
|
if(BUILD_CLIENT)
|
||||||
# tell IrrlichtMt to create a static library
|
# tell IrrlichtMt to create a static library
|
||||||
@ -101,11 +113,13 @@ else()
|
|||||||
# Note that we can't use target_include_directories() since that doesn't work for IMPORTED targets before CMake 3.11
|
# Note that we can't use target_include_directories() since that doesn't work for IMPORTED targets before CMake 3.11
|
||||||
set_target_properties(IrrlichtMt::IrrlichtMt PROPERTIES
|
set_target_properties(IrrlichtMt::IrrlichtMt PROPERTIES
|
||||||
INTERFACE_INCLUDE_DIRECTORIES "${IRRLICHT_INCLUDE_DIR}")
|
INTERFACE_INCLUDE_DIRECTORIES "${IRRLICHT_INCLUDE_DIR}")
|
||||||
else()
|
|
||||||
message(STATUS "Found IrrlichtMt ${IrrlichtMt_VERSION}")
|
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
if(TARGET IrrlichtMt::IrrlichtMt)
|
||||||
|
message(STATUS "Found IrrlichtMt ${IrrlichtMt_VERSION}")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
|
||||||
# Installation
|
# Installation
|
||||||
|
|
||||||
|
11
README.md
11
README.md
@ -224,10 +224,13 @@ Run it:
|
|||||||
- Debug build is slower, but gives much more useful output in a debugger.
|
- Debug build is slower, but gives much more useful output in a debugger.
|
||||||
- If you build a bare server you don't need to have the Irrlicht or IrrlichtMt library installed.
|
- If you build a bare server you don't need to have the Irrlicht or IrrlichtMt library installed.
|
||||||
- In that case use `-DIRRLICHT_INCLUDE_DIR=/some/where/irrlicht/include`.
|
- In that case use `-DIRRLICHT_INCLUDE_DIR=/some/where/irrlicht/include`.
|
||||||
- IrrlichtMt can also be installed somewhere that is not a standard install path.
|
|
||||||
- In that case use `-DCMAKE_PREFIX_PATH=/path/to/install_prefix`
|
- Minetest will use the IrrlichtMt package that is found first, given by the following order:
|
||||||
- The path must be set so that `$(CMAKE_PREFIX_PATH)/lib/cmake/IrrlichtMt` exists
|
1. Specified `IRRLICHTMT_BUILD_DIR` CMake variable
|
||||||
or that `$(CMAKE_PREFIX_PATH)` is the path of an IrrlichtMt build folder.
|
2. `${PROJECT_SOURCE_DIR}/lib/irrlichtmt` (if existent)
|
||||||
|
3. Installation of IrrlichtMt in the system-specific library paths
|
||||||
|
4. For server builds with disabled `BUILD_CLIENT` variable, the headers from `IRRLICHT_INCLUDE_DIR` will be used.
|
||||||
|
- NOTE: Changing the IrrlichtMt build directory (includes system installs) requires regenerating the CMake cache (`rm CMakeCache.txt`)
|
||||||
|
|
||||||
### CMake options
|
### CMake options
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user