From 66f66b7818b7cf47a20eae6b940e06c2ee12fe8a Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Thu, 22 Mar 2018 18:12:56 +0100 Subject: build: fix conan compiler detection --- cmake/modules/ConanPackages.cmake | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'cmake') 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() -- cgit v1.2.3