From b2c07bd47bd608afa5cc819b60a7b5bb8c9dd96a Mon Sep 17 00:00:00 2001 From: Andre Heinecke Date: Tue, 15 Nov 2016 14:33:31 +0100 Subject: qt, cpp: Add cmake config files for w32 * lang/cpp/src/GpgmeppConfig-w32.cmake.in.in lang/qt/src/QGpgmeConfig-w32.cmake.in.in: New. * lang/cpp/src/GpgmeppConfig.cmake.in.in, lang/qt/src/QGpgmeConfig.cmake.in.in: Remove libsuffix handling. * lang/cpp/src/Makefile.am, lang/qt/src/Makefile.am: Create / install w32 config files. * configure.ac: Configure them. -- To work with DLL's cmake needs to know about the implib and the final DLL. So the config files look different enough that it's better to use alternative files. --- lang/qt/src/Makefile.am | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'lang/qt/src/Makefile.am') diff --git a/lang/qt/src/Makefile.am b/lang/qt/src/Makefile.am index ead5c7fd..87e2ec2b 100644 --- a/lang/qt/src/Makefile.am +++ b/lang/qt/src/Makefile.am @@ -19,7 +19,8 @@ # 02111-1307, USA lib_LTLIBRARIES = libqgpgme.la EXTRA_DIST = QGpgmeConfig.cmake.in.in QGpgmeConfigVersion.cmake.in \ - gpgme_backend_debug.h qgpgme_version.h.in + gpgme_backend_debug.h qgpgme_version.h.in \ + QGpgmeConfig.cmake.in.in qgpgme_sources = \ dataprovider.cpp job.cpp multideletejob.cpp qgpgmeadduseridjob.cpp \ @@ -220,15 +221,15 @@ libqgpgme_la_LDFLAGS = -no-undefined -version-info \ @LIBQGPGME_LT_CURRENT@:@LIBQGPGME_LT_REVISION@:@LIBQGPGME_LT_AGE@ if HAVE_W32_SYSTEM -libsuffix=.dll.a +QGpgmeConfig.cmake: QGpgmeConfig-w32.cmake.in + sed -e 's|[@]resolved_bindir@|$(bindir)|g' < "$<" | \ + sed -e 's|[@]resolved_libdir@|$(libdir)|g' | \ + sed -e 's|[@]resolved_includedir@|$(includedir)|g' > $@ else -libsuffix=.so -endif - QGpgmeConfig.cmake: QGpgmeConfig.cmake.in sed -e 's|[@]resolved_libdir@|$(libdir)|g' < "$<" | \ - sed -e 's|[@]libsuffix@|$(libsuffix)|g' | \ sed -e 's|[@]resolved_includedir@|$(includedir)|g' > $@ +endif $(camelcase_headers): Makefile.am echo -n "#include \"qgpgme/" > "$@" -- cgit