From 401e4e6601157311fa79c95c7d1bc645b5539ee9 Mon Sep 17 00:00:00 2001
From: Paul Fd <paul@ferrand.cc>
Date: Sat, 14 Mar 2020 17:42:26 +0100
Subject: [PATCH] Put CXX standard to 17 on non-MOD targets

---
 .travis/script_library.sh |  7 ++++++-
 .travis/script_mingw.sh   | 16 ++++++++++++++--
 .travis/script_osx.sh     |  6 +++++-
 .travis/script_plugins.sh |  9 ++++++++-
 .travis/script_test.sh    |  9 ++++++++-
 5 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/.travis/script_library.sh b/.travis/script_library.sh
index 39944112..0d014f4e 100755
--- a/.travis/script_library.sh
+++ b/.travis/script_library.sh
@@ -2,5 +2,10 @@
 set -ex
 
 mkdir -p build/${INSTALL_DIR} && cd build
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_BUILD_TYPE=Release -DSFIZZ_LV2=OFF -DSFIZZ_VST=OFF -DSFIZZ_TESTS=OFF ..
+cmake -DCMAKE_BUILD_TYPE=Release \
+      -DSFIZZ_LV2=OFF \
+      -DSFIZZ_VST=OFF \
+      -DSFIZZ_TESTS=OFF \
+      -DCMAKE_CXX_STANDARD=17 \
+      ..
 make -j$(nproc)
diff --git a/.travis/script_mingw.sh b/.travis/script_mingw.sh
index 72a7e513..6ca765b6 100755
--- a/.travis/script_mingw.sh
+++ b/.travis/script_mingw.sh
@@ -5,11 +5,23 @@ set -ex
 
 mkdir -p build/${INSTALL_DIR} && cd build
 if [[ ${CROSS_COMPILE} == "mingw32" ]]; then
-  buildenv i686-w64-mingw32-cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_LTO=OFF -DSFIZZ_JACK=OFF -DSFIZZ_VST=ON -DSFIZZ_STATIC_LIBSNDFILE=ON ..
+  buildenv i686-w64-mingw32-cmake -DCMAKE_BUILD_TYPE=Release \
+                                  -DENABLE_LTO=OFF \
+                                  -DSFIZZ_JACK=OFF \
+                                  -DSFIZZ_VST=ON \
+                                  -DSFIZZ_STATIC_LIBSNDFILE=ON \
+                                  -DCMAKE_CXX_STANDARD=17 \
+                                  ..
   buildenv patch -p1 -i "$(pwd)"/../.travis/patches/vstsdk-3.6.14-mingw-atomic-add.diff -d ../vst/external/VST_SDK
   buildenv make -j$(nproc)
 elif [[ ${CROSS_COMPILE} == "mingw64" ]]; then
-  buildenv x86_64-w64-mingw32-cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_LTO=OFF -DSFIZZ_JACK=OFF -DSFIZZ_VST=ON -DSFIZZ_STATIC_LIBSNDFILE=ON ..
+  buildenv x86_64-w64-mingw32-cmake -DCMAKE_BUILD_TYPE=Release \
+                                    -DENABLE_LTO=OFF \
+                                    -DSFIZZ_JACK=OFF \
+                                    -DSFIZZ_VST=ON \
+                                    -DSFIZZ_STATIC_LIBSNDFILE=ON \
+                                    -DCMAKE_CXX_STANDARD=17 \
+                                    ..
   buildenv patch -p1 -i "$(pwd)"/../.travis/patches/vstsdk-3.6.14-mingw-atomic-add.diff -d ../vst/external/VST_SDK
   buildenv make -j$(nproc)
 fi
diff --git a/.travis/script_osx.sh b/.travis/script_osx.sh
index f39977d7..557259a6 100755
--- a/.travis/script_osx.sh
+++ b/.travis/script_osx.sh
@@ -2,7 +2,11 @@
 set -ex
 
 mkdir -p build/${INSTALL_DIR} && cd build
-cmake -DCMAKE_BUILD_TYPE=Release -DSFIZZ_VST=ON -DSFIZZ_TESTS=OFF ..
+cmake -DCMAKE_BUILD_TYPE=Release \
+      -DSFIZZ_VST=ON \
+      -DSFIZZ_TESTS=OFF \
+      -DCMAKE_CXX_STANDARD=17 \
+      ..
 make -j$(sysctl -n hw.ncpu)
 # Xcode not currently supported, see https://gitlab.kitware.com/cmake/cmake/issues/18088
 # xcodebuild -project sfizz.xcodeproj -alltargets -configuration Debug build
diff --git a/.travis/script_plugins.sh b/.travis/script_plugins.sh
index ed87cbcc..89eaf8ac 100755
--- a/.travis/script_plugins.sh
+++ b/.travis/script_plugins.sh
@@ -2,5 +2,12 @@
 set -ex
 
 mkdir -p build/${INSTALL_DIR} && cd build
-cmake -DCMAKE_BUILD_TYPE=Release -DSFIZZ_JACK=OFF -DSFIZZ_VST="$ENABLE_VST_PLUGIN" -DSFIZZ_TESTS=OFF -DSFIZZ_SHARED=OFF -DSFIZZ_STATIC_LIBSNDFILE=ON ..
+cmake -DCMAKE_BUILD_TYPE=Release \
+      -DSFIZZ_JACK=OFF \
+      -DSFIZZ_VST="$ENABLE_VST_PLUGIN" \
+      -DSFIZZ_TESTS=OFF \
+      -DSFIZZ_SHARED=OFF \
+      -DSFIZZ_STATIC_LIBSNDFILE=ON \
+      -DCMAKE_CXX_STANDARD=17 \
+      ..
 make -j$(nproc)
diff --git a/.travis/script_test.sh b/.travis/script_test.sh
index a3c90749..844ec9b9 100755
--- a/.travis/script_test.sh
+++ b/.travis/script_test.sh
@@ -2,6 +2,13 @@
 set -ex
 
 mkdir build && cd build
-cmake -DCMAKE_BUILD_TYPE=Release -DSFIZZ_JACK=OFF -DSFIZZ_TESTS=ON -DSFIZZ_SHARED=OFF -DSFIZZ_STATIC_LIBSNDFILE=OFF -DSFIZZ_LV2=OFF ..
+cmake -DCMAKE_BUILD_TYPE=Release \
+      -DSFIZZ_JACK=OFF \
+      -DSFIZZ_TESTS=ON \
+      -DSFIZZ_SHARED=OFF \
+      -DSFIZZ_STATIC_LIBSNDFILE=OFF \
+      -DSFIZZ_LV2=OFF \
+      -DCMAKE_CXX_STANDARD=17 \
+      ..
 make -j$(nproc) sfizz_tests
 tests/sfizz_tests