Maybe fix the build?

diff --git a/.travis.yml b/.travis.yml
index 611553aff2c35ce661afd80ddd125a5ef6c314de..8f6fb3c0981de59492bce38129ed93232153ff27 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,14 +2,11 @@ language: cpp
 compiler:
   - clang
   - gcc
-env:
-  - USE_STD_SHARED_PTR=1
-  - USE_STD_SHARED_PTR=0
 before_install:
   - sudo apt-add-repository -y ppa:jkeiren/ppa
   - if test $CC = gcc; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; fi
   - sudo apt-get update -qq
-  - if test $CC = gcc; then sudo apt-get install gcc-4.7 g++-4.7; fi
+  - if test $CC = gcc; then sudo apt-get install --yes --force-yes gcc-4.7 g++-4.7; fi
   - if test $CC = gcc; then sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.7 20; fi
   - if test $CC = gcc; then sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.7 20; fi
   - if test $CC = gcc; then sudo update-alternatives --config gcc; fi

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bd597229a3238278527233350218a5259ae4a300..8141a52bc08850153f622f21c0f9518374d07e76 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,7 +11,6 @@ include_directories(${CMAKE_CURRENT_LIST_DIR})
 set(ENTITYX_BUILD_TESTING false CACHE BOOL "Enable building of tests.")
 set(ENTITYX_RUN_BENCHMARKS false CACHE BOOL "Run benchmarks (in conjunction with -DENTITYX_BUILD_TESTING=1).")
 set(ENTITYX_MAX_COMPONENTS 64 CACHE STRING "Set the maximum number of components.")
-set(ENTITYX_USE_CPP11_STDLIB true CACHE BOOL "For Clang, specify whether to use libc++ (-stdlib=libc++).")
 set(ENTITYX_BUILD_SHARED false CACHE BOOL "Build shared libraries?")
 
 include(${CMAKE_ROOT}/Modules/CheckIncludeFile.cmake)

diff --git a/scripts/travis.sh b/scripts/travis.sh
index b6b7975ff75d3bbc46c949670a9002a81983c260..c8b2a176b929c2d5c6ce14559efc0e2493eed7ff 100755 (executable)
--- a/scripts/travis.sh
+++ b/scripts/travis.sh
@@ -1,15 +1,5 @@
 #!/bin/bash -e
 
-CMAKE_ARGS="-DCMAKE_BUILD_TYPE=Debug -DENTITYX_BUILD_TESTING=1"
-
-if [ "$USE_STD_SHARED_PTR" = "1" ]; then
-  CMAKE_ARGS="${CMAKE_ARGS}"
-  # This fails on OSX
-  if [ "$CXX" = "clang++" ]; then
-    CMAKE_ARGS="${CMAKE_ARGS} -DENTITYX_USE_CPP11_STDLIB=1"
-  fi
-fi
-
-cmake ${CMAKE_ARGS}
+cmake -DCMAKE_BUILD_TYPE=Debug -DENTITYX_BUILD_TESTING=1
 make VERBOSE=1
 make test || cat Testing/Temporary/LastTest.log