Merge pull request #829 from GregoryLundberg/GL_travis

Test for Travis and only require SDL 2.0.2
wesnoth · Oct 16, 2016 · db400ed · db400ed
2 parents 988096d + 34dcd06
commit db400ed
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -57,9 +57,12 @@ option(ENABLE_LIBPNG "Enable support for writing png files (screenshots, images)
 option(ENABLE_LIBINTL "Enable using libintl for translations instead of Boost.Locale library (not recommended)" OFF)
 option(ENABLE_HISTORY "Enable using GNU history for history in lua console" ON)
 
+if(DEFINED ENV{TRAVIS})
+	find_package(SDL2 2.0.2 REQUIRED)
+else()
+	find_package(SDL2 2.0.4 REQUIRED)
+endif()
 
-find_package(SDL2 2.0.4 REQUIRED)
-
 find_package(Boost 1.36 REQUIRED COMPONENTS iostreams program_options regex system thread)
 find_package(Boost 1.40 REQUIRED COMPONENTS random)
 

diff --git a/SConstruct b/SConstruct
@@ -178,7 +178,10 @@ if env['distcc']:
 
 if env['ccache']: env.Tool('ccache')
 
-SDL2_version = '2.0.4';
+if 'TRAVIS' in os.environ:
+    SDL2_version = '2.0.2';
+else:
+    SDL2_version = '2.0.4';
 
 
 Help("""Arguments may be a mixture of switches and targets in any order.