diff options
| author | Alec Thomas <alec@swapoff.org> | 2014-07-07 14:09:32 +1000 |
|---|---|---|
| committer | Alec Thomas <alec@swapoff.org> | 2014-07-07 14:09:32 +1000 |
| commit | 1b878b7ff1f003e558baafe1b58ddea10d8c060d (patch) | |
| tree | 5375478b724fff0238aa7a8f942a7a512858be9f /scripts | |
| parent | 36a991d4c6d9ae5515d4e8e3a2c784ed87b65b4b (diff) | |
Maybe fix the build?
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/travis.sh | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/scripts/travis.sh b/scripts/travis.sh index b6b7975..c8b2a17 100755 --- 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 |