diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | packaging/ios/Subsurface-mobile.pro | 2 | ||||
| -rwxr-xr-x | packaging/windows/mxe-based-build.sh | 2 | ||||
| -rwxr-xr-x | packaging/windows/smtk2ssrf-mxe-build.sh | 2 | ||||
| -rw-r--r-- | smtk-import/CMakeLists.txt | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index dbb2995dd..f27ba3c4b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -73,7 +73,7 @@ add_definitions(-DSUBSURFACE_SOURCE="${SUBSURFACE_SOURCE}") set(CMAKE_C_STANDARD 99) set(CMAKE_C_STANDARD_REQUIRED TRUE) -set(CMAKE_CXX_STANDARD 11) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED TRUE) # diff --git a/packaging/ios/Subsurface-mobile.pro b/packaging/ios/Subsurface-mobile.pro index 7a6498ebd..e9c81dfb2 100644 --- a/packaging/ios/Subsurface-mobile.pro +++ b/packaging/ios/Subsurface-mobile.pro @@ -4,7 +4,7 @@ QT += qml quick quickcontrols2 widgets positioning concurrent svg bluetooth DEFINES += SUBSURFACE_MOBILE BT_SUPPORT BLE_SUPPORT -CONFIG += c++11 +CONFIG += c++17 QMAKE_TARGET_BUNDLE_PREFIX = org.subsurface-divelog QMAKE_BUNDLE = subsurface-mobile diff --git a/packaging/windows/mxe-based-build.sh b/packaging/windows/mxe-based-build.sh index d15b90c12..ecae2e7e8 100755 --- a/packaging/windows/mxe-based-build.sh +++ b/packaging/windows/mxe-based-build.sh @@ -114,7 +114,7 @@ fi echo "Building in $BUILDDIR ..." export PATH="$BASEDIR"/"$MXEDIR"/usr/bin:$PATH:"$BASEDIR"/"$MXEDIR"/usr/"$MXEBUILDTYPE"/qt5/bin/ -export CXXFLAGS=-std=c++11 +export CXXFLAGS=-std=c++17 if [[ "$1" == "debug" ]] ; then RELEASE="Debug" diff --git a/packaging/windows/smtk2ssrf-mxe-build.sh b/packaging/windows/smtk2ssrf-mxe-build.sh index a1db2a05c..858075ad2 100755 --- a/packaging/windows/smtk2ssrf-mxe-build.sh +++ b/packaging/windows/smtk2ssrf-mxe-build.sh @@ -136,7 +136,7 @@ case "$RELEASE" in esac export PATH="$BASEDIR"/mxe/usr/bin:$PATH:"$BASEDIR"/mxe/usr/i686-w64-mingw32.shared/qt5/bin/ -export CXXFLAGS=-std=c++11 +export CXXFLAGS=-std=c++17 export PKG_CONFIG_PATH_i686_w64_mingw32_static="$BASEDIR/mxe/usr/i686-w64-mingw32.static/lib/pkgconfig" export PKG_CONFIG_PATH_i686_w64_mingw32_shared="$BASEDIR/mxe/usr/i686-w64-mingw32.shared/lib/pkgconfig" export PKG_CONFIG_PATH="$PKG_CONFIG_PATH_i686_w64_mingw32_static":"$PKG_CONFIG_PATH_i686_w64_mingw32_shared" diff --git a/smtk-import/CMakeLists.txt b/smtk-import/CMakeLists.txt index 19761f56a..444506764 100644 --- a/smtk-import/CMakeLists.txt +++ b/smtk-import/CMakeLists.txt @@ -85,7 +85,7 @@ endif() # Set compiler flags and definitions set(CMAKE_C_STANDARD 99) set(CMAKE_C_STANDARD_REQUIRED TRUE) -set(CMAKE_CXX_STANDARD 11) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED TRUE) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") |