From fca80bbd27da04119102c1bbf745f2ac08c32a59 Mon Sep 17 00:00:00 2001
From: clanmills <robin@clanmills.com>
Date: Wed, 20 May 2020 10:21:31 +0100
Subject: [PATCH] sync ci changes from fix_547_0.27 to this branch.

---
 ci/install_dependencies.sh | 4 ++--
 ci/run.sh                  | 1 +
 ci/test_build.py           | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ci/install_dependencies.sh b/ci/install_dependencies.sh
index d4cf1bad..396319d9 100755
--- a/ci/install_dependencies.sh
+++ b/ci/install_dependencies.sh
@@ -57,9 +57,9 @@ case "$distro_id" in
 
     'opensuse'|'opensuse-tumbleweed')
         zypper --non-interactive refresh
-        zypper --non-interactive install gcc-c++ clang cmake make ccache libexpat-devel zlib-devel libssh-devel libcurl-devel git which dos2unix libxml2-tools
-        curl -LO https://github.com/google/googletest/archive/release-1.8.0.tar.gz
+        zypper --non-interactive install gcc-c++ clang cmake make ccache libexpat-devel zlib-devel libssh-devel curl tar libcurl-devel git which dos2unix libxml2-tools
         pushd /tmp
+          curl -LO https://github.com/google/googletest/archive/release-1.8.0.tar.gz
           tar xzf   release-1.8.0.tar.gz
           mkdir -p  googletest-release-1.8.0/build
           pushd     googletest-release-1.8.0/build
diff --git a/ci/run.sh b/ci/run.sh
index 2a6dfe40..52574802 100755
--- a/ci/run.sh
+++ b/ci/run.sh
@@ -17,6 +17,7 @@ if [[ "$(uname -s)" == 'Linux' ]]; then
 else
     export CMAKE_OPTIONS="$CMAKE_OPTIONS -DEXIV2_TEAM_USE_SANITIZERS=ON"
 fi
+CMAKE_OPTIONS="$CMAKE_OPTIONS -DCMAKE_CXX_FLAGS=-Wno-deprecated"
 
 mkdir build
 cd    build
diff --git a/ci/test_build.py b/ci/test_build.py
index 84e68c52..462409bd 100644
--- a/ci/test_build.py
+++ b/ci/test_build.py
@@ -40,8 +40,8 @@ def matrix_build(shared_libs, ccs, build_types, cmake_bin, cmake_options,
         )
         os.mkdir(cwd)
 
-        cmake = "{cmake_bin} {!s} -DCMAKE_BUILD_TYPE={build_type} " \
-            "-DBUILD_SHARED_LIBS={lib_type} -DEXIV2_BUILD_UNIT_TESTS={tests} "\
+        cmake = "{cmake_bin} {!s} -DCMAKE_BUILD_TYPE={build_type} -DCMAKE_CXX_FLAGS=-Wno-deprecated " \
+            "-DBUILD_SHARED_LIBS={lib_type} -DEXIV2_BUILD_UNIT_TESTS={tests} -DCMAKE_CXX_STANDARD=98 "\
             "../..".format(
                 cmake_options, cmake_bin=cmake_bin, build_type=build_type,
                 lib_type=lib_type, tests="ON" if tests else "OFF"