Unverified Commit 4a51017c authored by Adrià Arrufat's avatar Adrià Arrufat Committed by GitHub
Browse files

Make Travis read the CXXFLAGS enviroment variable (#2366)



* try to make sure travis uses C++17

* fix unbound variable

* Update dlib/travis/build-and-test.sh
Co-authored-by: default avatarDavis E. King <davis@dlib.net>
parent b99bec58
...@@ -7,11 +7,16 @@ if [ -n "${MATRIX_EVAL+set}" ]; then ...@@ -7,11 +7,16 @@ if [ -n "${MATRIX_EVAL+set}" ]; then
eval "${MATRIX_EVAL}" eval "${MATRIX_EVAL}"
fi fi
CXX_FLAGS="-std=c++11"
if [ ! -z ${CXXFLAGS+set} ]; then
CXX_FLAGS="${CXXFLAGS}"
fi
# build dlib and tests # build dlib and tests
if [ "$VARIANT" = "test" ]; then if [ "$VARIANT" = "test" ]; then
mkdir build mkdir build
cd build cd build
cmake ../dlib/test cmake ../dlib/test -DCMAKE_CXX_FLAGS="${CXX_FLAGS}"
cmake --build . --target dtest -- -j 2 cmake --build . --target dtest -- -j 2
./dtest --runall $DISABLED_TESTS ./dtest --runall $DISABLED_TESTS
fi fi
...@@ -20,7 +25,7 @@ fi ...@@ -20,7 +25,7 @@ fi
if [ "$VARIANT" = "test-debug" ]; then if [ "$VARIANT" = "test-debug" ]; then
mkdir build mkdir build
cd build cd build
cmake ../dlib/test -DDLIB_ENABLE_ASSERTS=1 cmake ../dlib/test -DDLIB_ENABLE_ASSERTS=1 -DCMAKE_CXX_FLAGS="${CXX_FLAGS}"
cmake --build . --target dtest -- -j 2 cmake --build . --target dtest -- -j 2
./dtest --runall $DISABLED_TESTS ./dtest --runall $DISABLED_TESTS
fi fi
...@@ -28,14 +33,14 @@ fi ...@@ -28,14 +33,14 @@ fi
if [ "$VARIANT" = "dlib_all_source_cpp" ]; then if [ "$VARIANT" = "dlib_all_source_cpp" ]; then
mkdir build mkdir build
cd build cd build
cmake ../dlib/test cmake ../dlib/test -DCMAKE_CXX_FLAGS="${CXX_FLAGS}"
cmake --build . --target dlib_all_source_cpp -- -j 2 cmake --build . --target dlib_all_source_cpp -- -j 2
fi fi
if [ "$VARIANT" = "tools" ]; then if [ "$VARIANT" = "tools" ]; then
mkdir build mkdir build
cd build cd build
cmake ../dlib/test/tools cmake ../dlib/test/tools -DCMAKE_CXX_FLAGS="${CXX_FLAGS}"
cmake --build . -- -j 2 cmake --build . -- -j 2
fi fi
...@@ -44,37 +49,37 @@ fi ...@@ -44,37 +49,37 @@ fi
if [ "$VARIANT" = "old-cmake" ]; then if [ "$VARIANT" = "old-cmake" ]; then
mkdir build mkdir build
cd build cd build
CMAKEDIR=../cmake CMAKEDIR=../cmake -DCMAKE_CXX_FLAGS="${CXX_FLAGS}"
$CMAKEDIR/2.8/bin/cmake ../dlib/test/tools $CMAKEDIR/2.8/bin/cmake ../dlib/test/tools
$CMAKEDIR/2.8/bin/cmake --build . -- -j 2 $CMAKEDIR/2.8/bin/cmake --build . -- -j 2
rm -rf * rm -rf *
$CMAKEDIR/3.1/bin/cmake ../dlib/test/tools $CMAKEDIR/3.1/bin/cmake ../dlib/test/tools
$CMAKEDIR/3.1/bin/cmake --build . -- -j 2 $CMAKEDIR/3.1/bin/cmake --build . -- -j 2
rm -rf * rm -rf *
$CMAKEDIR/3.5/bin/cmake ../dlib/test/tools $CMAKEDIR/3.5/bin/cmake ../dlib/test/tools
$CMAKEDIR/3.5/bin/cmake --build . -- -j 2 $CMAKEDIR/3.5/bin/cmake --build . -- -j 2
# just to make sure there isn't anything funny about building standalone dlib # just to make sure there isn't anything funny about building standalone dlib
rm -rf * rm -rf *
$CMAKEDIR/2.8/bin/cmake ../dlib $CMAKEDIR/2.8/bin/cmake ../dlib
$CMAKEDIR/2.8/bin/cmake --build . -- -j 2 $CMAKEDIR/2.8/bin/cmake --build . -- -j 2
fi fi
if [ "$VARIANT" = "examples" ]; then if [ "$VARIANT" = "examples" ]; then
mkdir build mkdir build
cd build cd build
cmake ../examples cmake ../examples -DCMAKE_CXX_FLAGS="${CXX_FLAGS}"
cmake --build . -- -j 1 cmake --build . -- -j 1
fi fi
if [ "$VARIANT" = "examples-debug" ]; then if [ "$VARIANT" = "examples-debug" ]; then
mkdir build mkdir build
cd build cd build
cmake ../examples -DDLIB_ENABLE_ASSERTS=1 cmake ../examples -DDLIB_ENABLE_ASSERTS=1 -DCMAKE_CXX_FLAGS="${CXX_FLAGS}"
cmake --build . -- -j 1 cmake --build . -- -j 1
fi fi
...@@ -83,4 +88,3 @@ if [ "$VARIANT" = "python-api" ]; then ...@@ -83,4 +88,3 @@ if [ "$VARIANT" = "python-api" ]; then
pip uninstall numpy -y pip uninstall numpy -y
python setup.py test --clean python setup.py test --clean
fi fi
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment