1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42
|
From: Kristian Nielsen <knielsen@knielsen-hq.org>
Date: Wed, 26 Jun 2024 18:38:16 +0200
Subject: Fix build with newer CGAL.
Thanks to Joachim Reichel for the patch.
Origin: other, https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1074117#5
Applied-Upstream: commit:254904624763e4dd2d04ca5706af303a1f0a1777
Forwarded: not-needed
---
CMakeLists.txt | 2 +-
c++std.pri | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5455594..d3f3244 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -68,7 +68,7 @@ file(MAKE_DIRECTORY ${AUTOGEN_BUILD_DIR})
add_compile_options("$<$<CONFIG:DEBUG>:-DDEBUG>")
-set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD 17)
add_definitions(-D_REENTRANT -DUNICODE -D_UNICODE)
# Stack size 8MB; github issue 116
add_definitions(-DSTACKSIZE=8388608)
diff --git a/c++std.pri b/c++std.pri
index 6d3744c..338dbf4 100644
--- a/c++std.pri
+++ b/c++std.pri
@@ -26,8 +26,8 @@ macx {
}
c++std {
- CONFIG += c++14 strict_c++
- message("Using C++14")
+ CONFIG += c++17 strict_c++
+ message("Using C++17")
*clang*: {
# 3rd party libraries will probably violate this for a long time
|