Skip to content

Commit

Permalink
Merge pull request #50 from conan-io/feature/libcxx_clang
Browse files Browse the repository at this point in the history
detect libcxx in clang
  • Loading branch information
memsharded authored Nov 28, 2017
2 parents cbb26f4 + 9986ecd commit 78b3594
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion conan.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,8 @@ function(conan_cmake_settings result)
set(_SETTINGS ${_SETTINGS} -s compiler=clang -s compiler.version=${MAJOR}.${MINOR} -s compiler.libcxx=libstdc++)
endif()
else()
set(_SETTINGS ${_SETTINGS} -s compiler=clang -s compiler.version=${MAJOR}.${MINOR} -s compiler.libcxx=libstdc++)
conan_cmake_detect_gnu_libcxx(_LIBCXX)
set(_SETTINGS ${_SETTINGS} -s compiler=clang -s compiler.version=${MAJOR}.${MINOR} -s compiler.libcxx=${_LIBCXX})
endif()
elseif(${CMAKE_CXX_COMPILER_ID} STREQUAL MSVC)
set(_VISUAL "Visual Studio")
Expand Down

0 comments on commit 78b3594

Please sign in to comment.