diff options
| author | Howaner <franzi.moos@googlemail.com> | 2014-09-12 19:13:46 +0200 |
|---|---|---|
| committer | Howaner <franzi.moos@googlemail.com> | 2014-09-12 19:13:46 +0200 |
| commit | 1223a24d3c87832c08545e6f3e8e4c51ff1e7e3f (patch) | |
| tree | f7cf72e49a7ca60d10af12ad9ff70910e089b028 /CMakeLists.txt | |
| parent | Renamed SetWalkSpeed() to SetRelativeWalkSpeed() (diff) | |
| parent | Fixed iron ore drop. (diff) | |
| download | cuberite-1223a24d3c87832c08545e6f3e8e4c51ff1e7e3f.tar cuberite-1223a24d3c87832c08545e6f3e8e4c51ff1e7e3f.tar.gz cuberite-1223a24d3c87832c08545e6f3e8e4c51ff1e7e3f.tar.bz2 cuberite-1223a24d3c87832c08545e6f3e8e4c51ff1e7e3f.tar.lz cuberite-1223a24d3c87832c08545e6f3e8e4c51ff1e7e3f.tar.xz cuberite-1223a24d3c87832c08545e6f3e8e4c51ff1e7e3f.tar.zst cuberite-1223a24d3c87832c08545e6f3e8e4c51ff1e7e3f.zip | |
Diffstat (limited to '')
| -rw-r--r-- | CMakeLists.txt | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index dd9b1e67c..188cf81e3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 2.8.2) +cmake_minimum_required (VERSION 2.8.7) # Without this, the MSVC variable isn't defined for MSVC builds ( http://www.cmake.org/pipermail/cmake/2011-November/047130.html ) enable_language(CXX C) @@ -18,6 +18,25 @@ if(DEFINED ENV{TRAVIS_BUILD_WITH_COVERAGE}) set(BUILD_WITH_COVERAGE $ENV{TRAVIS_BUILD_WITH_COVERAGE}) endif() +if(DEFINED ENV{MCSERVER_BUILD_ID}) + set(BUILD_ID $ENV{MCSERVER_BUILD_ID}) + set(BUILD_SERIES_NAME $ENV{MCSERVER_BUILD_SERIES_NAME}) + set(BUILD_DATETIME $ENV{MCSERVER_BUILD_DATETIME}) + if(DEFINED ENV{MCSERVER_BUILD_COMMIT_ID}) + set(BUILD_COMMIT_ID $ENV{MCSERVER_BUILD_COMMIT_ID}) + else() + message("Commit id not set, attempting to determine id from git") + execute_process( + COMMAND git rev-parse HEAD + RESULT_VARIABLE GIT_EXECUTED + OUTPUT_VARIABLE BUILD_COMMIT_ID) + string(STRIP ${BUILD_COMMIT_ID} BUILD_COMMIT_ID) + if (NOT (GIT_EXECUTED EQUAL 0)) + message(FATAL_ERROR "Could not identifiy git commit id") + endif() + endif() +endif() + # This has to be done before any flags have been set up. if(${BUILD_TOOLS}) add_subdirectory(Tools/MCADefrag/) |