squidy/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2025-12-18 06:28:03 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14170 from sledgehammer999/use_cxx1z

Browse Source 
Use c++1z to enable c++17
This commit is contained in:
sledgehammer999
2021-01-07 13:40:05 +02:00
committed by GitHub
parent e4c177fec7 7fe7c6c277
commit 0cbd15890a
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@@ -6711,7 +6711,7 @@ if ac_fn_cxx_try_compile "$LINENO"
then :
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
QBT_ADD_CONFIG="$QBT_ADD_CONFIG c++17"
QBT_ADD_CONFIG="$QBT_ADD_CONFIG c++1z"
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: C++17 mode is now force enabled. The C++ mode should match the mode that other libraries were built with, otherwise you'll likely get linking errors." >&5
printf "%s\n" "$as_me: WARNING: C++17 mode is now force enabled. The C++ mode should match the mode that other libraries were built with, otherwise you'll likely get linking errors." >&2;}
else $as_nop

2
configure.ac
View File

@@ -216,7 +216,7 @@ AS_IF([test "x$QBT_CXX17_FOUND" = "xno"],
CXXFLAGS="-std=c++17 $TMP_CXXFLAGS"
AC_COMPILE_IFELSE([DETECT_CPP17_PROGRAM()],
[AC_MSG_RESULT([no])
QBT_ADD_CONFIG="$QBT_ADD_CONFIG c++17"
QBT_ADD_CONFIG="$QBT_ADD_CONFIG c++1z"
AC_MSG_WARN([C++17 mode is now force enabled. The C++ mode should match the mode that other libraries were built with, otherwise you'll likely get linking errors.])],
[AC_MSG_RESULT([yes])
AC_MSG_ERROR([The compiler supports C++17 but the user or a dependency has explicitly enabled a lower mode.])])],