summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTycho <work.tycho+git@gmail.com>2014-03-10 21:52:13 +0100
committerTycho <work.tycho+git@gmail.com>2014-03-10 21:52:13 +0100
commite4c7aac1cce39822a39da6bde28ac2066c9c0026 (patch)
treecb46facab0560bde1af36d2543624c5f7d6f494f
parentMove env code part 2 (diff)
downloadcuberite-e4c7aac1cce39822a39da6bde28ac2066c9c0026.tar
cuberite-e4c7aac1cce39822a39da6bde28ac2066c9c0026.tar.gz
cuberite-e4c7aac1cce39822a39da6bde28ac2066c9c0026.tar.bz2
cuberite-e4c7aac1cce39822a39da6bde28ac2066c9c0026.tar.lz
cuberite-e4c7aac1cce39822a39da6bde28ac2066c9c0026.tar.xz
cuberite-e4c7aac1cce39822a39da6bde28ac2066c9c0026.tar.zst
cuberite-e4c7aac1cce39822a39da6bde28ac2066c9c0026.zip
Diffstat (limited to '')
-rw-r--r--.travis.yml8
-rw-r--r--CMakeLists.txt12
2 files changed, 11 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml
index 14dad4df4..0ab25ae3b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,10 +6,10 @@ compiler:
script: cmake . -DBUILD_TOOLS=1 -DSELF_TEST=1 && make -j 2 && cd MCServer/ && (echo stop | $MCSERVER_PATH)
env:
- - MCSERVER_BUILD_TYPE=RELEASE MCSERVER_PATH=./MCServer
- - MCSERVER_BUILD_TYPE=DEBUG MCSERVER_PATH=./MCServer_debug
- - MCSERVER_BUILD_TYPE=RELEASE MCSERVER_FORCE32=1 MCSERVER_PATH=./MCServer
- - MCSERVER_BUILD_TYPE=DEBUG MCSERVER_FORCE32=1 MCSERVER_PATH=./MCServer_debug
+ - TRAVIS_MCSERVER_BUILD_TYPE=RELEASE MCSERVER_PATH=./MCServer
+ - TRAVIS_MCSERVER_BUILD_TYPE=DEBUG MCSERVER_PATH=./MCServer_debug
+ - TRAVIS_MCSERVER_BUILD_TYPE=RELEASE TRAVIS_MCSERVER_FORCE32=1 MCSERVER_PATH=./MCServer
+ - TRAVIS_MCSERVER_BUILD_TYPE=DEBUG TRAVIS_MCSERVER_FORCE32=1 MCSERVER_PATH=./MCServer_debug
# Notification Settings
notifications:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e7e8daf7d..9a860920c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,13 +3,15 @@ cmake_minimum_required (VERSION 2.6)
# 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)
-if(DEFINED ENV{MCSERVER_BUILD_TYPE})
- message("Setting build type to $ENV{MCSERVER_BUILD_TYPE}")
- set(CMAKE_BUILD_TYPE $ENV{MCSERVER_BUILD_TYPE})
+# These env variables are used for configuring Travis CI builds.
+# See https://github.com/mc-server/MCServer/pull/767
+if(DEFINED ENV{TRAVIS_MCSERVER_BUILD_TYPE})
+ message("Setting build type to $ENV{TRAVIS_MCSERVER_BUILD_TYPE}")
+ set(CMAKE_BUILD_TYPE $ENV{TRAVIS_MCSERVER_BUILD_TYPE})
endif()
-if(DEFINED ENV{MCSERVER_FORCE32})
- set(FORCE32 $ENV{MCSERVER_FORCE32})
+if(DEFINED ENV{TRAVIS_MCSERVER_FORCE32})
+ set(FORCE32 $ENV{TRAVIS_MCSERVER_FORCE32})
endif()
# This has to be done before any flags have been set up.