diff options
| author | Andreas Sturmlechner <andreas.sturmlechner@gmail.com> | 2018-04-15 23:46:50 +0200 |
|---|---|---|
| committer | George Kiagiadakis <george.kiagiadakis@collabora.com> | 2018-05-04 14:19:41 +0300 |
| commit | 1967da1ffcf04eddbc250c65d6f6efce4b77fe4b (patch) | |
| tree | 78448cfcbb0f9a274445fd18a70c4ec112509802 | |
| parent | 91c9011e901ccd713e225ac85b4c46e1689b98ce (diff) | |
Fix cmake with Qt 5.11_beta3 (dropping qt5_use_modules)
https://bugzilla.gnome.org/show_bug.cgi?id=795285
| -rw-r--r-- | cmake/modules/FindQt4or5.cmake | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/cmake/modules/FindQt4or5.cmake b/cmake/modules/FindQt4or5.cmake index 855a48e..d73b3a2 100644 --- a/cmake/modules/FindQt4or5.cmake +++ b/cmake/modules/FindQt4or5.cmake @@ -49,6 +49,16 @@ macro(_qt4or5_component_names_to_qt_components output_list) list(REMOVE_DUPLICATES ${output_list}) endmacro() +macro(_qt5_component_names_to_target_link_libaries output_list) + foreach(module ${ARGN}) + _qt4or5_component_name_to_qt_component(qt_component ${module}) + list(APPEND ${output_list} Qt5::${qt_component}) + unset(qt_component) + endforeach() + + list(REMOVE_DUPLICATES ${output_list}) +endmacro() + if (Qt4or5_FIND_QUIETLY) set(_Qt4or5_FIND_PACKAGE_ARGS QUIET) endif() @@ -195,13 +205,13 @@ function(qt4or5_use_modules _target _link_type) set(modules ${_link_type} ${ARGN}) endif() - _qt4or5_component_names_to_qt_components(real_modules ${modules}) - # Verify that Qt5 was found before using qt5_* macros, # otherwise cmake will bail out if they are undefined. if (${QT_VERSION} STREQUAL "5" AND Qt5Core_FOUND) - qt5_use_modules(${_target} ${link_type} ${real_modules}) + _qt5_component_names_to_target_link_libaries(real_modules ${modules}) + target_link_libraries(${_target} ${link_type} ${real_modules}) elseif (${QT_VERSION} STREQUAL "4") + _qt4or5_component_names_to_qt_components(real_modules ${modules}) qt4_use_modules(${_target} ${link_type} ${real_modules}) endif() endfunction() |