MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'lethosor/travis-build' into develop

develop
lethosor 2015-10-03 16:06:02 -04:00
parent c11febf386 f4a2188e42
commit 220b73e2a8
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.travis.yml
Unescape Escape View File

@ -2,15 +2,24 @@ sudo: false
addons: addons:
apt: apt:
packages: packages:
- gcc-multilib
- g++-multilib
- lua5.2 - lua5.2
- libxml-libxml-perl
- libxml-libxslt-perl
- zlib1g-dev:i386
language: cpp language: cpp
before_install: before_install:
pip install --user sphinx pip install --user sphinx
script: script:
- git tag tmp-travis-build
- python travis/pr-check-base.py - python travis/pr-check-base.py
- python travis/lint.py - python travis/lint.py
- python travis/script-in-readme.py - python travis/script-in-readme.py
- python travis/script-syntax.py --ext=lua --cmd="luac5.2 -p" - python travis/script-syntax.py --ext=lua --cmd="luac5.2 -p"
- python travis/script-syntax.py --ext=rb --cmd="ruby -c" - python travis/script-syntax.py --ext=rb --cmd="ruby -c"
- mkdir build-travis
- cd build-travis
- cmake .. && make -j2
notifications: notifications:
email: false email: false

2
depends/protobuf/CMakeLists.txt
Unescape Escape View File

@ -12,7 +12,7 @@ IF(CMAKE_COMPILER_IS_GNUCC)
# SET(STL_HASH_OLD_GCC 1) # SET(STL_HASH_OLD_GCC 1)
#ENDIF() #ENDIF()
SET(CMAKE_CXX_FLAGS "-std=c++0x") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
SET(HAVE_HASH_MAP 0) SET(HAVE_HASH_MAP 0)
SET(HASH_MAP_CLASS unordered_map) SET(HASH_MAP_CLASS unordered_map)