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

CMake: Do not discard empty QMAKE_LIBS_FOO entries

Browse Source 
Consider a qmake lib 'foo' that doesn't have entries in
QMAKE_LIBS_FOO. Then we must not discard this entry in the generated
module pri file, because otherwise any attempt to QMAKE_USE 'foo' will
fail with the error message "Library 'foo' is not defined.".

Pick-to: 6.0
Task-number: QTBUG-88951
Change-Id: Ibed283857f5f66b1b79459fe7b7cf06c7ce0691d
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Joerg Bornemann 2020-11-26 17:29:05 +01:00
parent 5592204b19
commit bd98ba0d17
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cmake/QtGenerateLibPri.cmake
View File

@ -62,10 +62,8 @@ foreach(lib ${known_libs})
qt_transform_absolute_library_paths_to_link_flags(value_release "${value_release}") qt_transform_absolute_library_paths_to_link_flags(value_release "${value_release}")
if(value_debug STREQUAL value_release) if(value_debug STREQUAL value_release)
if(value_debug) qmake_list(value_debug ${value_debug})
qmake_list(value_debug ${value_debug}) string(APPEND content "QMAKE_LIBS_${lib} = ${value_debug}\n")
string(APPEND content "QMAKE_LIBS_${lib} = ${value_debug}\n")
endif()
else() else()
if(value_debug) if(value_debug)
qmake_list(value_debug ${value_debug}) qmake_list(value_debug ${value_debug})
@ -88,11 +86,13 @@ foreach(lib ${known_libs})
set(value ${QMAKE_${infix}_${lib}_${cfg}}) set(value ${QMAKE_${infix}_${lib}_${cfg}})
if(infix STREQUAL "LIBS") if(infix STREQUAL "LIBS")
qt_transform_absolute_library_paths_to_link_flags(value "${value}") 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() endif()
if(value) qmake_list(value ${value})
qmake_list(value ${value}) string(APPEND content "QMAKE_${infix}_${lib} = ${value}\n")
string(APPEND content "QMAKE_${infix}_${lib} = ${value}\n")
endif()
endforeach() endforeach()
endforeach() endforeach()
file(WRITE "${OUT_FILE}" "${content}") file(WRITE "${OUT_FILE}" "${content}")