diff options
| author | Stephen Kelly <stephen.kelly@kdab.com> | 2012-10-07 10:42:36 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-09 06:09:32 +0200 |
| commit | 95e548eeaac3f498920351cb5ec9acba48e2a63e (patch) | |
| tree | 1d677c852d40762181b8a81f2eb4c3bb29f16b30 /mkspecs | |
| parent | 2672c4fa91c8a8f0f7024b4a2dd92bfa1aa47649 (diff) | |
Generate ';' separated libraries in prl files for CMake.
The generated CMake files need to pass ';' separated libraries to
the IMPORTED_LINK_INTERFACE_LIBRARIES property, otherwise we get errors
such as this:
http://testresults.qt-project.org/ci/QtTools_master_Integration/build_00386/win32-msvc2010_Windows_7/log.txt.gz
(grep for QtCore5.lib.lib)
Rather than a naive and error prone replacement of whitespace, generate
the appropriate ';' separated content directly in the qmake prl file.
Change-Id: I8eb5e233a0318b57ec74b86d910583ff99c29415
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Brad King <brad.king@kitware.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/cmake/Qt5BasicConfig.cmake.in | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mkspecs/cmake/Qt5BasicConfig.cmake.in b/mkspecs/cmake/Qt5BasicConfig.cmake.in index 8fb3ffb581..28b687ee95 100644 --- a/mkspecs/cmake/Qt5BasicConfig.cmake.in +++ b/mkspecs/cmake/Qt5BasicConfig.cmake.in @@ -78,9 +78,8 @@ if (NOT Qt5_EXCLUDE_STATIC_DEPENDENCIES) macro(macro_process_prl_file prl_file_location Configuration) if (EXISTS \"${prl_file_location}\") - file(STRINGS \"${prl_file_location}\" prl_strings REGEX \"QMAKE_PRL_LIBS\") - string(REGEX REPLACE \"QMAKE_PRL_LIBS *= *([^\\n]*)\" \"\\\\1\" static_depends ${prl_strings} ) - string(STRIP ${static_depends} static_depends) + file(STRINGS \"${prl_file_location}\" prl_strings REGEX \"QMAKE_PRL_LIBS_FOR_CMAKE\") + string(REGEX REPLACE \"QMAKE_PRL_LIBS_FOR_CMAKE *= *([^\\n]*)\" \"\\\\1\" static_depends ${prl_strings} ) if (_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES) set(_list_sep \";\") endif() |