From aa097aa028773219c6d109c27dd88a695a1072c2 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Wed, 20 May 2020 14:33:21 +0200 Subject: [PATCH] CMake: Hot fix for Ninja Multi-Config with MSVC and OpenSSL For now, we have to turn off the 3rdparty lib generation code for qt_lib_XXX.pri files, because it's broken for NMC if the 3rdparty libraries have different binaries per config. The actual fix is more involved. Task-number: QTBUG-84348 Change-Id: I863e69085b68c0dbbb3f6c415111bc255799e155 Reviewed-by: Alexandru Croitor --- cmake/QtBuild.cmake | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake index d05fdad4926..d50daf8458d 100644 --- a/cmake/QtBuild.cmake +++ b/cmake/QtBuild.cmake @@ -793,7 +793,12 @@ QT_MODULES += ${config_module_name} qt_path_join(private_pri_file "${target_path}" "qt_lib_${config_module_name}_private.pri") list(APPEND pri_files "${private_pri_file}") - qt_get_qmake_libraries_pri_content(libraries_content ${config_module_name}) + if(CMAKE_GENERATOR STREQUAL "Ninja Multi-Config") + ### FIXME QTBUG-84348 + set(libraries_content "") + else() + qt_get_qmake_libraries_pri_content(libraries_content ${config_module_name}) + endif() file(GENERATE OUTPUT "${private_pri_file}"