diff options
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtGenerateLibPri.cmake | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/cmake/QtGenerateLibPri.cmake b/cmake/QtGenerateLibPri.cmake index d4e0d04682..45c09d4fbe 100644 --- a/cmake/QtGenerateLibPri.cmake +++ b/cmake/QtGenerateLibPri.cmake @@ -62,10 +62,8 @@ foreach(lib ${known_libs}) qt_transform_absolute_library_paths_to_link_flags(value_release "${value_release}") if(value_debug STREQUAL value_release) - if(value_debug) - qmake_list(value_debug ${value_debug}) - string(APPEND content "QMAKE_LIBS_${lib} = ${value_debug}\n") - endif() + qmake_list(value_debug ${value_debug}) + string(APPEND content "QMAKE_LIBS_${lib} = ${value_debug}\n") else() if(value_debug) qmake_list(value_debug ${value_debug}) @@ -88,11 +86,13 @@ foreach(lib ${known_libs}) set(value ${QMAKE_${infix}_${lib}_${cfg}}) if(infix STREQUAL "LIBS") qt_transform_absolute_library_paths_to_link_flags(value "${value}") + elseif("${value}" STREQUAL "") + # Do not write empty entries, but ensure to write at least + # the QMAKE_LIBS_FOO entry to make the lib 'foo' known. + continue() endif() - if(value) - qmake_list(value ${value}) - string(APPEND content "QMAKE_${infix}_${lib} = ${value}\n") - endif() + qmake_list(value ${value}) + string(APPEND content "QMAKE_${infix}_${lib} = ${value}\n") endforeach() endforeach() file(WRITE "${OUT_FILE}" "${content}") |