diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-12-15 22:30:36 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-01-04 15:34:54 +0000 |
| commit | efc8ee12eff0f8970c49db49960cca21849cec02 (patch) | |
| tree | 477635f31f25e68dabf8b1a14b3598c105df0368 /cmake | |
| parent | cd600d95b1f8ffeb66ca3f0dd2c61a659e6fc78c (diff) | |
CMake: Fix glitch in module pri generation for Ninja Multi-Config
With Ninja Multi-Config, QMAKE_LIBS_FOO_DEBUG and QMAKE_LIBS_FOO_RELEASE
are generated, if their values differ. In that case we did not create an
empty QMAKE_LIBS_FOO assignment. That, however, is needed to make the
library 'foo' known to qmake_use.prf.
This amends bd98ba0d17b7a7c14fefc1741e68e8ca945a6655.
Fixes: QTBUG-89387
Change-Id: I80e23746e6ba6ff7f5f4186116232395814cee15
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
(cherry picked from commit e40b31fe6803dea39649c7c61eaca5b8d597dacf)
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtGenerateLibPri.cmake | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/cmake/QtGenerateLibPri.cmake b/cmake/QtGenerateLibPri.cmake index 45c09d4fbe..f5763899e6 100644 --- a/cmake/QtGenerateLibPri.cmake +++ b/cmake/QtGenerateLibPri.cmake @@ -65,6 +65,7 @@ foreach(lib ${known_libs}) qmake_list(value_debug ${value_debug}) string(APPEND content "QMAKE_LIBS_${lib} = ${value_debug}\n") else() + string(APPEND content "QMAKE_LIBS_${lib} =\n") if(value_debug) qmake_list(value_debug ${value_debug}) string(APPEND content "QMAKE_LIBS_${lib}_DEBUG = ${value_debug}\n") |