From bce8f4ca3e15823479b7081518f8590c490ca4bd Mon Sep 17 00:00:00 2001
From: Remy Prechelt <prechelt@hawaii.edu>
Date: Tue, 24 May 2022 19:36:45 +0000
Subject: [PATCH] Forward our requirement for C++17 onto Conan (needed for
Boost).
---
CMakeLists.txt | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1a3992a0a..3066765b1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -115,9 +115,13 @@ include (conan) # self-provided in 'cmake' directory
#
# download and build all dependencies
message (STATUS "Installing dependencies from Conan (this may take some time)...")
-if(NOT APPLE)
- set(SETTINGS compiler.libcxx=libstdc++11) # not available on MacOS
-endif()
+if (APPLE)
+ # compiler.libcxx is not available on MacOS
+ set(SETTINGS compiler.cppstd=17)
+else (APPLE)
+ set(SETTINGS compiler.libcxx=libstdc++11 compiler.cppstd=17)
+endif (APPLE)
+#
conan_cmake_run (CONANFILE conanfile.txt
BASIC_SETUP CMAKE_TARGETS
BUILD missing
--
GitLab