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 <[email protected]> Reviewed-by: Paul Lemire <[email protected]> Reviewed-by: Joerg Bornemann <[email protected]> Reviewed-by: Kevin Funk <[email protected]>
redshiftzero · Mar 1, 2019 · f5850cb · f5850cb
1 parent 20063cf
commit f5850cb
Showing 1 changed file with 3 additions and 1 deletion.
diff --git 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) {