IAP GITLAB

Skip to content
Snippets Groups Projects
Commit bce8f4ca authored by Remy Prechelt's avatar Remy Prechelt Committed by Maximilian Reininghaus
Browse files

Forward our requirement for C++17 onto Conan (needed for Boost).

parent 3afac351
No related branches found
No related tags found
1 merge request!400Forward our requirement for C++17 onto Conan (needed for Boost).
...@@ -115,9 +115,13 @@ include (conan) # self-provided in 'cmake' directory ...@@ -115,9 +115,13 @@ include (conan) # self-provided in 'cmake' directory
# #
# download and build all dependencies # download and build all dependencies
message (STATUS "Installing dependencies from Conan (this may take some time)...") message (STATUS "Installing dependencies from Conan (this may take some time)...")
if(NOT APPLE) if (APPLE)
set(SETTINGS compiler.libcxx=libstdc++11) # not available on MacOS # compiler.libcxx is not available on MacOS
endif() set(SETTINGS compiler.cppstd=17)
else (APPLE)
set(SETTINGS compiler.libcxx=libstdc++11 compiler.cppstd=17)
endif (APPLE)
#
conan_cmake_run (CONANFILE conanfile.txt conan_cmake_run (CONANFILE conanfile.txt
BASIC_SETUP CMAKE_TARGETS BASIC_SETUP CMAKE_TARGETS
BUILD missing BUILD missing
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment