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

.travis.yml

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

depends/protobuf/CMakeLists.txt

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