diff options
| author | Felix Morgner <felix.morgner@gmail.com> | 2018-03-22 18:12:56 +0100 |
|---|---|---|
| committer | Felix Morgner <felix.morgner@gmail.com> | 2018-03-22 18:12:56 +0100 |
| commit | 66f66b7818b7cf47a20eae6b940e06c2ee12fe8a (patch) | |
| tree | 015760206c04b171be4deb28551c8b2e8f6080c0 /cmake/modules | |
| parent | 003a197b71bcde27d6d79a8040ca29c827080270 (diff) | |
| download | extfs-66f66b7818b7cf47a20eae6b940e06c2ee12fe8a.tar.xz extfs-66f66b7818b7cf47a20eae6b940e06c2ee12fe8a.zip | |
build: fix conan compiler detection
Diffstat (limited to 'cmake/modules')
| -rw-r--r-- | cmake/modules/ConanPackages.cmake | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/cmake/modules/ConanPackages.cmake b/cmake/modules/ConanPackages.cmake index 9fdcc68..90432eb 100644 --- a/cmake/modules/ConanPackages.cmake +++ b/cmake/modules/ConanPackages.cmake @@ -1,10 +1,18 @@ +if(${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang") + set(CONAN_COMPILER "clang") +elseif(${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU") + set(CONAN_COMPILER "gcc") +endif() + +string(SUBSTRING ${CMAKE_CXX_COMPILER_VERSION} 0 3 CONAN_COMPILER_VERSION) + if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/conanfile.txt") message(STATUS "Current conanfile.txt directory: ${CMAKE_CURRENT_SOURCE_DIR}") if(NOT EXISTS "${CMAKE_BINARY_DIR}/conanbuildinfo.cmake") message(STATUS "Collecting conan packages") execute_process( COMMAND - conan install --build=missing --generator cmake ${CMAKE_CURRENT_SOURCE_DIR} + conan install --settings compiler=${CONAN_COMPILER} --settings compiler.version=${CONAN_COMPILER_VERSION} --build=missing --generator cmake ${CMAKE_CURRENT_SOURCE_DIR} OUTPUT_QUIET ) endif() |