Use GNU for Windows build.
continuous-integration/drone/push Build is failing
Details
continuous-integration/drone/push Build is failing
Details
This commit is contained in:
parent
57b5766490
commit
3d55c4d449
|
@ -25,7 +25,11 @@ if (NOT EXISTS ${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
|
||||||
message(WARNING "The file conanbuildinfo.cmake doesn't exist, running conan install.")
|
message(WARNING "The file conanbuildinfo.cmake doesn't exist, running conan install.")
|
||||||
string(REPLACE "." ";" VERSION_LIST "${CMAKE_CXX_COMPILER_VERSION}")
|
string(REPLACE "." ";" VERSION_LIST "${CMAKE_CXX_COMPILER_VERSION}")
|
||||||
list(GET VERSION_LIST 0 MAJOR)
|
list(GET VERSION_LIST 0 MAJOR)
|
||||||
execute_process(COMMAND conan install ${CMAKE_SOURCE_DIR} --install-folder=${CMAKE_BINARY_DIR} --build missing -s compiler=${CMAKE_CXX_COMPILER} -s compiler.libcxx=libstdc++11 -s compiler.version=${MAJOR})
|
if (NOT WINDOWS)
|
||||||
|
execute_process(COMMAND conan install ${CMAKE_SOURCE_DIR} --install-folder=${CMAKE_BINARY_DIR} --build missing -s compiler=clang -s compiler.libcxx=libstdc++11 -s compiler.version=${MAJOR})
|
||||||
|
else()
|
||||||
|
execute_process(COMMAND conan install ${CMAKE_SOURCE_DIR} --install-folder=${CMAKE_BINARY_DIR} --build missing -s compiler=GNU -s compiler.libcxx=libstdc++11 -s compiler.version=${MAJOR})
|
||||||
|
endif()
|
||||||
endif ()
|
endif ()
|
||||||
include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
|
include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
|
||||||
conan_basic_setup()
|
conan_basic_setup()
|
||||||
|
|
Loading…
Reference in New Issue