From 6b0e4a2e6d76e0dfb862620214c43b244237453c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20D=C3=ADaz=20M=C3=A1s?= <piponazo@gmail.com>
Date: Mon, 5 Apr 2021 16:28:23 +0200
Subject: [PATCH] ci - changes to use c++11

---
 ci/run.sh | 41 ++++++++++++++++++++++++++---------------
 1 file changed, 26 insertions(+), 15 deletions(-)

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