From 4f67ca4c0ac2f3ea4090882d982670b94913c6b2 Mon Sep 17 00:00:00 2001 From: Tycho Date: Wed, 10 Sep 2014 18:08:50 +0100 Subject: Added MCServer_ prfix to env vars for versions --- CMakeLists.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 8f58f157a..188cf81e3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,12 +18,12 @@ if(DEFINED ENV{TRAVIS_BUILD_WITH_COVERAGE}) set(BUILD_WITH_COVERAGE $ENV{TRAVIS_BUILD_WITH_COVERAGE}) endif() -if(DEFINED ENV{BUILD_ID}) - set(BUILD_ID $ENV{BUILD_ID}) - set(BUILD_SERIES_NAME $ENV{BUILD_SERIES_NAME}) - set(BUILD_DATETIME $ENV{BUILD_DATETIME}) - if(DEFINED ENV{BUILD_COMMIT_ID}) - set(BUILD_COMMIT_ID $ENV{BUILD_COMMIT_ID}) +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( -- cgit v1.2.3