D6772: Fix usage of query_qmake: differ between calls expecting qmake or not

Friedrich W. H. Kossebau noreply at phabricator.kde.org
Thu Jul 27 15:55:47 UTC 2017


kossebau added a comment.


  In https://phabricator.kde.org/D6772#129531, @apol wrote:
  
  > Works for me.
  >  Are you sure we don't need to include the `TRY` on other calls?
  
  
  Any calls you would be thinking off? The ones where this patch does not add `TRY` are in code which expects qmake to exist and the method to return a proper value, and which do not have a fallback plan if it doesn't. Which boils down to the case where the user explicitly set `KDE_INSTALL_USE_QT_SYS_PATHS` to `TRUE` but no qmake-qt5 is around.
  
  These are the calls I am aware off, and where TRY is only passed if failing is handled directly or rather indirectly):
  kde-modules/KDEInstallDirs.cmake:    query_qmake(qt_install_prefix_dir QT_INSTALL_PREFIX TRY)
  kde-modules/KDEInstallDirs.cmake:    query_qmake(qt_plugins_dir QT_INSTALL_PLUGINS)
  kde-modules/KDEInstallDirs.cmake:    query_qmake(qt_imports_dir QT_INSTALL_IMPORTS)
  kde-modules/KDEInstallDirs.cmake:    query_qmake(qt_qml_dir QT_INSTALL_QML)
  kde-modules/KDEInstallDirs.cmake:    query_qmake(qt_docs_dir QT_INSTALL_DOCS)
  modules/ECMAddQch.cmake:        query_qmake(qt_docs_dir QT_INSTALL_DOCS TRY)
  modules/ECMGeneratePriFile.cmake:    query_qmake(qt_install_prefix_dir QT_INSTALL_PREFIX TRY)
  modules/ECMGeneratePriFile.cmake:  query_qmake(qt_host_data_dir QT_HOST_DATA)

REPOSITORY
  R240 Extra CMake Modules

BRANCH
  handlenoqmakefound

REVISION DETAIL
  https://phabricator.kde.org/D6772

To: kossebau, #frameworks, ltoscano, rdieter, apol
Cc: #build_system
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kde-buildsystem/attachments/20170727/8e8e107a/attachment.html>


More information about the Kde-buildsystem mailing list