From 3fdbda832c00984d26f757703957106bac1d019c Mon Sep 17 00:00:00 2001 From: Sebastian Messmer Date: Sat, 27 Jun 2020 00:53:55 -0700 Subject: [PATCH] Setup conan compiler.libcxx correctly --- cmake-utils/conan-setup.cmake | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/cmake-utils/conan-setup.cmake b/cmake-utils/conan-setup.cmake index 9dd4fe44..9ede8272 100644 --- a/cmake-utils/conan-setup.cmake +++ b/cmake-utils/conan-setup.cmake @@ -1,9 +1,16 @@ macro(setup_conan) include(cmake-utils/conan.cmake) - conan_cmake_run( - CONANFILE conanfile.py - BUILD missing) + if(MSVC) + conan_cmake_run( + CONANFILE conanfile.py + BUILD missing) + else() + conan_cmake_run( + CONANFILE conanfile.py + BUILD missing + SETTINGS compiler.libcxx=libstdc++11) + endif() conan_basic_setup(TARGETS SKIP_STD) if(CONAN_SETTINGS_COMPILER_LIBCXX STREQUAL "libstdc++")