From be0e653ce3039b1a81d23bed9dc99c0e60a7995a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ingo=20Kl=C3=B6cker?= Date: Sat, 8 Jul 2023 21:36:35 +0200 Subject: [PATCH] qt: Fix DLL version in cmake config files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * lang/qt/src/QGpgmeConfig-w32.cmake.in.in, lang/qt/src/QGpgmeQt6Config-w32.cmake.in.in: Fix name and path of DLL. -- Co-authored-by: Biswapriyo Nath Signed-off-by: Ingo Klöcker --- lang/qt/src/QGpgmeConfig-w32.cmake.in.in | 4 ++-- lang/qt/src/QGpgmeQt6Config-w32.cmake.in.in | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lang/qt/src/QGpgmeConfig-w32.cmake.in.in b/lang/qt/src/QGpgmeConfig-w32.cmake.in.in index dbd466c6..c1d894c6 100644 --- a/lang/qt/src/QGpgmeConfig-w32.cmake.in.in +++ b/lang/qt/src/QGpgmeConfig-w32.cmake.in.in @@ -65,11 +65,11 @@ set_target_properties(QGpgme PROPERTIES IMPORTED_IMPLIB_RELEASE "@resolved_libdir@/libqgpgme.dll.a" INTERFACE_INCLUDE_DIRECTORIES "@resolved_includedir@/qgpgme;@resolved_includedir@" INTERFACE_LINK_LIBRARIES "Gpgmepp;Qt5::Core" - IMPORTED_LOCATION "@resolved_libdir@/libqgpgme-7.dll" + IMPORTED_LOCATION "@resolved_bindir@/libqgpgme-15.dll" ) list(APPEND _IMPORT_CHECK_TARGETS QGpgme ) -list(APPEND _IMPORT_CHECK_FILES_FOR_QGpgme "@resolved_libdir@/libqgpgme.dll.a" "@resolved_bindir@/libqgpgme-7.dll" ) +list(APPEND _IMPORT_CHECK_FILES_FOR_QGpgme "@resolved_libdir@/libqgpgme.dll.a" "@resolved_bindir@/libqgpgme-15.dll" ) if(CMAKE_VERSION VERSION_LESS 2.8.12) message(FATAL_ERROR "This file relies on consumers using CMake 2.8.12 or greater.") diff --git a/lang/qt/src/QGpgmeQt6Config-w32.cmake.in.in b/lang/qt/src/QGpgmeQt6Config-w32.cmake.in.in index 6cb8af40..af0fa3eb 100644 --- a/lang/qt/src/QGpgmeQt6Config-w32.cmake.in.in +++ b/lang/qt/src/QGpgmeQt6Config-w32.cmake.in.in @@ -65,11 +65,11 @@ set_target_properties(QGpgmeQt6 PROPERTIES IMPORTED_IMPLIB_RELEASE "@resolved_libdir@/libqgpgmeqt6.dll.a" INTERFACE_INCLUDE_DIRECTORIES "@resolved_includedir@/qgpgme;@resolved_includedir@" INTERFACE_LINK_LIBRARIES "Gpgmepp;Qt6::Core" - IMPORTED_LOCATION "@resolved_libdir@/libqgpgmeqt6-7.dll" + IMPORTED_LOCATION "@resolved_bindir@/libqgpgmeqt6-15.dll" ) list(APPEND _IMPORT_CHECK_TARGETS QGpgmeQt6 ) -list(APPEND _IMPORT_CHECK_FILES_FOR_QGpgmeQt6 "@resolved_libdir@/libqgpgmeqt6.dll.a" "@resolved_bindir@/libqgpgmeqt6-7.dll" ) +list(APPEND _IMPORT_CHECK_FILES_FOR_QGpgmeQt6 "@resolved_libdir@/libqgpgmeqt6.dll.a" "@resolved_bindir@/libqgpgmeqt6-15.dll" ) if(CMAKE_VERSION VERSION_LESS 2.8.12) message(FATAL_ERROR "This file relies on consumers using CMake 2.8.12 or greater.")