diff options
| author | Alec Thomas <alec@swapoff.org> | 2013-11-29 12:47:51 -0500 |
|---|---|---|
| committer | Alec Thomas <alec@swapoff.org> | 2013-11-29 12:47:51 -0500 |
| commit | d6579543c099c974b9557249aee72306c5aea99d (patch) | |
| tree | c15af8586d5b88941603a91ab50aa5bdb6be2ef7 /scripts/travis.sh | |
| parent | 92714459511725e9b638c7f2435d7f18f97600b1 (diff) | |
| parent | b92144502f6d7e779aa7f1e7b657aee2314abf57 (diff) | |
Merge no-boost into master.
This eradicates boost as a dependency for everything except the Python
integration, which may or may not work for now.
Diffstat (limited to 'scripts/travis.sh')
| -rwxr-xr-x | scripts/travis.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/travis.sh b/scripts/travis.sh index dadc478..b6b7975 100755 --- a/scripts/travis.sh +++ b/scripts/travis.sh @@ -3,7 +3,7 @@ CMAKE_ARGS="-DCMAKE_BUILD_TYPE=Debug -DENTITYX_BUILD_TESTING=1" if [ "$USE_STD_SHARED_PTR" = "1" ]; then - CMAKE_ARGS="${CMAKE_ARGS} -DENTITYX_USE_STD_SHARED_PTR=1" + CMAKE_ARGS="${CMAKE_ARGS}" # This fails on OSX if [ "$CXX" = "clang++" ]; then CMAKE_ARGS="${CMAKE_ARGS} -DENTITYX_USE_CPP11_STDLIB=1" |