diff options
| author | Tobias C. Berner <tcberner@FreeBSD.org> | 2019-10-01 04:13:31 +0000 |
|---|---|---|
| committer | Tobias C. Berner <tcberner@FreeBSD.org> | 2019-10-01 04:13:31 +0000 |
| commit | c45de9579f6ec97574056dd335df02031ccd00ad (patch) | |
| tree | bf42b7c476faa7a6183d0feaa4c65bb90053847d /devel/qt5/files/extrapatch-mkspecs_features_data_cmake_Qt5BasicConfig.cmake.in | |
| parent | irc/py-limnoria: Backport Web plugin bugfixes (diff) | |
Qt5 update to 5.13.0
For new features, check: https://wiki.qt.io/New_Features_in_Qt_5.13
Thanks to adridg who helped to fix a lot of packages.
Exp-run by: antoine
PR: 238782
Diffstat (limited to 'devel/qt5/files/extrapatch-mkspecs_features_data_cmake_Qt5BasicConfig.cmake.in')
| -rw-r--r-- | devel/qt5/files/extrapatch-mkspecs_features_data_cmake_Qt5BasicConfig.cmake.in | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/devel/qt5/files/extrapatch-mkspecs_features_data_cmake_Qt5BasicConfig.cmake.in b/devel/qt5/files/extrapatch-mkspecs_features_data_cmake_Qt5BasicConfig.cmake.in new file mode 100644 index 000000000000..6480ed7d2caa --- /dev/null +++ b/devel/qt5/files/extrapatch-mkspecs_features_data_cmake_Qt5BasicConfig.cmake.in @@ -0,0 +1,18 @@ +Fix the location of the Qt5 libraries in the generated cmake files. Without this patch +we will get stuff like: +LINK_FLAGS = [...] /usr/local/lib/libQt5Widgets.so [...] +LINK_LIBRARIES= [...] /usr/local/lib/qt5/libQt5Widgets.so.5.13.0 [...] +in the generated build.ninja files, making the builds fail due to the wrong path in +LINK_FLAGS + +--- mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in.orig 2019-06-13 04:18:18 UTC ++++ mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +@@ -53,7 +53,7 @@ function(_qt5_$${CMAKE_MODULE_NAME}_process_prl_file p + set(_lib_deps) + set(_link_flags) + +- get_filename_component(_qt5_install_libs \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/lib\" ABSOLUTE) ++ get_filename_component(_qt5_install_libs \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/lib/qt5\" ABSOLUTE) + + if(EXISTS \"${prl_file_location}\") + file(STRINGS \"${prl_file_location}\" _prl_strings REGEX \"QMAKE_PRL_LIBS[ \\t]*=\") |