diff options
author | Alexander Harkness <me@bearbin.net> | 2016-07-30 15:22:18 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-07-30 15:22:18 +0200 |
commit | 9e52982f0e8ce1c99f48d51e38f843323427750c (patch) | |
tree | 171149b6ed419f7e9fadf127a4641a4bd1ff8064 /CMakeLists.txt | |
parent | Fixed port command line argument. (#3287) (diff) | |
download | cuberite-9e52982f0e8ce1c99f48d51e38f843323427750c.tar cuberite-9e52982f0e8ce1c99f48d51e38f843323427750c.tar.gz cuberite-9e52982f0e8ce1c99f48d51e38f843323427750c.tar.bz2 cuberite-9e52982f0e8ce1c99f48d51e38f843323427750c.tar.lz cuberite-9e52982f0e8ce1c99f48d51e38f843323427750c.tar.xz cuberite-9e52982f0e8ce1c99f48d51e38f843323427750c.tar.zst cuberite-9e52982f0e8ce1c99f48d51e38f843323427750c.zip |
Diffstat (limited to '')
-rw-r--r-- | CMakeLists.txt | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index aaaac1e1f..1cee91c93 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,11 +3,11 @@ # Use CMake to generate the build files for your platform # # This script supports some configuration through CMake arguments (-Dparam=val syntax): -# BUILD_TOOLS=1 sets up additional executables to be built along with the server (ProtoProxy, GrownBiomeGenVisualiser, MCADefrag) -# BUILD_UNSTABLE_TOOLS=1 sets up yet more executables to be built, these can be broken and generally are obsolete (GeneratorPerformanceTest) -# CROSSCOMPILE=1 marks the build as a crosscompile (doesn't include optimizations for current platform) -# DISABLE_SYSTEM_LUA=1 disables the use of system Lua interpreter; the tolua executable will be built and used instead. Incompatible with cross-compiling -# SELF_TEST=1 enables testing code to be built +# BUILD_TOOLS=1 sets up additional executables to be built along with the server (ProtoProxy, GrownBiomeGenVisualiser, MCADefrag) +# BUILD_UNSTABLE_TOOLS=1 sets up yet more executables to be built, these can be broken and generally are obsolete (GeneratorPerformanceTest) +# NO_NATIVE_OPTIMIZATION=1 disables CPU-specific optimisations for the current machine, allows use on other CPUs of the same platform +# DISABLE_SYSTEM_LUA=1 disables the use of system Lua interpreter; the tolua executable will be built and used instead. Incompatible with cross-compiling +# SELF_TEST=1 enables testing code to be built @@ -118,16 +118,10 @@ if (NOT(DISABLE_SYSTEM_LUA)) message(STATUS "Lua 5.1 has been found in your system and will be used for the build.") set(USE_SYSTEM_LUA 1) else() - if (CROSSCOMPILE) - message(FATAL "To crosscompile, you need to have Lua 5.1 installed in your system and available in PATH.") - endif() message(STATUS "Lua 5.1 has NOT been found in your system, the build will use its own Lua implementation.") unset(USE_SYSTEM_LUA) endif() else() - if (CROSSCOMPILE) - message(FATAL "CMake parameter mismatch: CROSSCOMPILE is mutually exclusive with DISABLE_SYSTEM_LUA") - endif() message(STATUS "System Lua is disabled via CMake command-line parameters. The build will use its own Lua implementation.") endif() |