ci - changes to use c++11

main
Luis Díaz Más 4 years ago
parent 0bbaa6eff3
commit 6b0e4a2e6d

@ -3,27 +3,33 @@
set -e set -e
set -x set -x
source conan/bin/activate export CMAKE_OPTIONS="$COMMON_CMAKE_OPTIONS -DCMAKE_BUILD_TYPE=$BUILD_TYPE"
if [ -n "$WITH_COVERAGE" ]; then
export CMAKE_OPTIONS="$CMAKE_OPTIONS -DBUILD_WITH_COVERAGE=ON"
fi
if [[ "$(uname -s)" == 'Linux' ]]; then if [ -n "$WITH_SANITIZERS" ]; then
if [ "$CC" == "clang" ]; then export CMAKE_OPTIONS="$CMAKE_OPTIONS -DEXIV2_TEAM_USE_SANITIZERS=ON"
# clang + Ubuntu don't like to run with UBSAN, but ASAN works fi
export CMAKE_OPTIONS="$COMMON_CMAKE_OPTIONS"
elif [ -n "$WITH_VALGRIND" ]; then if [ -n "$WITH_VALGRIND" ]; then
export EXIV2_VALGRIND="valgrind --quiet" export EXIV2_VALGRIND="valgrind --quiet"
else
export CMAKE_OPTIONS="$COMMON_CMAKE_OPTIONS -DEXIV2_TEAM_USE_SANITIZERS=OFF"
fi
else
export CMAKE_OPTIONS="$COMMON_CMAKE_OPTIONS -DEXIV2_TEAM_USE_SANITIZERS=OFF"
fi fi
CMAKE_OPTIONS="$COMMON_CMAKE_OPTIONS -DCMAKE_CXX_FLAGS=-Wno-deprecated -DCMAKE_CXX_STANDARD=98 -DCMAKE_BUILD_TYPE=$BUILD_TYPE"
mkdir build if [[ "$(uname -s)" == 'Darwin' ]]; then
cd build export CMAKE_OPTIONS="$CMAKE_OPTIONS -DCMAKE_PREFIX_PATH=/usr/local/opt/gettext/"
fi
source conan/bin/activate
mkdir build && cd build
conan install .. -o webready=True --build missing conan install .. -o webready=True --build missing
cmake ${CMAKE_OPTIONS} .. cmake ${CMAKE_OPTIONS} ..
make -j make -j
make tests make tests
make install make install
@ -35,6 +41,11 @@ else
exit 1 exit 1
fi fi
pushd .
cd bin
$EXIV2_VALGRIND ./unit_tests
popd
if [ -n "$COVERAGE" ]; then if [ -n "$COVERAGE" ]; then
bash <(curl -s https://codecov.io/bash) bash <(curl -s https://codecov.io/bash)
fi fi

Loading…
Cancel
Save