1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: Hot fix for Ninja Multi-Config with MSVC and OpenSSL

Browse Source 
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 <alexandru.croitor@qt.io>
This commit is contained in:
Joerg Bornemann 2020-05-20 14:33:21 +02:00
parent 0b01e62ff4
commit aa097aa028
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmake/QtBuild.cmake
View File

@ -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}"