0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Test for Travis and only require SDL 2.0.2

Browse source
This commit is contained in:
Gregory A Lundberg 2016-10-16 03:36:57 -05:00
parent ae18397608
commit 34dcd0657f
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
CMakeLists.txt
View file

@ -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)

5
SConstruct
View file

@ -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.