diff options
| author | Jean-Michaël Celerier <jean-michael.celerier@kdab.com> | 2019-02-18 12:30:29 +0100 |
|---|---|---|
| committer | Jean-Michaël Celerier <jean-michael.celerier@kdab.com> | 2019-03-01 14:15:12 +0000 |
| commit | f5850cb0da5d9b610711d4fd3c1eaded9d6414e1 (patch) | |
| tree | 21cf6a09699fb19a5d362a117fcff7905fb01698 /mkspecs | |
| parent | 20063cf99995f45c16e5c6952eb1d7609324be9f (diff) | |
CMake: fix generation of config files for external Qt modules
When such modules aren't following the libQt5Foo.so naming convention,
the generated CMake files would be incorrect.
Change-Id: I57908f7466bff7a05f19271ccd495849476bdf38
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Kevin Funk <kevin.funk@kdab.com>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/create_cmake.prf | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf index 2ed708e085..6bf1380716 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf @@ -200,7 +200,9 @@ CMAKE_QT5_MODULE_DEPS = $$join(lib_deps, ";") CMAKE_INTERFACE_MODULE_DEPS = $$join(aux_mod_deps, ";") CMAKE_INTERFACE_QT5_MODULE_DEPS = $$join(aux_lib_deps, ";") -CMAKE_QT_STEM = Qt$$QT_MAJOR_VERSION$${CMAKE_MODULE_NAME}$${QT_LIBINFIX} +# TARGET here is the one changed at the end of qt_module.prf, +# which already contains the Qt5 prefix and QT_LIBINFIX suffix +CMAKE_QT_STEM = $${TARGET} mac { !isEmpty(CMAKE_STATIC_TYPE) { |