Skip to content

Commit 77bd0d3

Browse files
committed
CMakePM: Fix building openssl 1.1.1w with conan
The openssl 1.1.1.w package had an issue compiling on Windows with Visual C++. The fix is a variation of the upstream change at conan-io/cmake-conan#689 Fixes: QTCREATORBUG-33451 Change-Id: I1bd1b171f1a34f78bf70b8221a4b9b75636d3ae6
1 parent 3b42d94 commit 77bd0d3

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

src/share/3rdparty/package-manager/conan_provider.cmake

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,9 @@ macro(append_compiler_executables_configuration)
329329
"Please define CMAKE_CXX_COMPILER or enable the C++ language.")
330330
endif()
331331

332-
if(NOT "x${_conan_c_compiler}${_conan_cpp_compiler}" STREQUAL "x")
332+
# QtCreator: see https://github.com/conan-io/cmake-conan/pull/689 for details
333+
if(NOT "x${_conan_c_compiler}${_conan_cpp_compiler}" STREQUAL "x"
334+
AND NOT CMAKE_C_COMPILER_ID STREQUAL "MSVC")
333335
string(APPEND PROFILE "tools.build:compiler_executables={${_conan_c_compiler}${_conan_cpp_compiler}}\n")
334336
endif()
335337
unset(_conan_c_compiler)

0 commit comments

Comments
 (0)