Index: b/configure.ac =================================================================== --- b/configure.ac +++ b/configure.ac @@ -182,6 +182,7 @@ have_android_system=no have_w32_system=no have_w64_system=no +have_macos_system=no build_w32_glib=no build_w32_qt=no available_languages="cl cpp python python2 python3 qt" @@ -196,6 +197,9 @@ *-linux-androideabi) have_android_system=yes ;; + *-apple-darwin*) + have_macos_system=yes + ;; esac case "${host}" in *-mingw32ce*|*-mingw32*) @@ -253,6 +257,12 @@ fi AM_CONDITIONAL(HAVE_ANDROID_SYSTEM, test "$have_android_system" = yes) +if test "$have_macos_system" = yes; then + AC_DEFINE(HAVE_MACOS_SYSTEM,1, + [Defined if we build for an MacOS system]) +fi +AM_CONDITIONAL(HAVE_MACOS_SYSTEM, test "$have_macos_system" = yes) + AM_CONDITIONAL(BUILD_W32_GLIB, test "$build_w32_glib" = yes) Index: b/lang/cpp/src/GpgmeppConfig.cmake.in.in =================================================================== --- b/lang/cpp/src/GpgmeppConfig.cmake.in.in +++ b/lang/cpp/src/GpgmeppConfig.cmake.in.in @@ -64,7 +64,7 @@ set_target_properties(Gpgmepp PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "@resolved_includedir@/gpgme++;@resolved_includedir@" INTERFACE_LINK_LIBRARIES "pthread;@resolved_libdir@/libgpgme.so;@LIBASSUAN_LIBS@" - IMPORTED_LOCATION "@resolved_libdir@/libgpgmepp.so" + IMPORTED_LOCATION "@resolved_libdir@/libgpgmepp@libsuffix@" ) if(CMAKE_VERSION VERSION_LESS 2.8.12) Index: b/lang/cpp/src/Makefile.am =================================================================== --- b/lang/cpp/src/Makefile.am +++ b/lang/cpp/src/Makefile.am @@ -69,6 +69,12 @@ libgpgmepp_la_LDFLAGS = -no-undefined -version-info \ @LIBGPGMEPP_LT_CURRENT@:@LIBGPGMEPP_LT_REVISION@:@LIBGPGMEPP_LT_AGE@ +if HAVE_MACOS_SYSTEM +libsuffix=.dylib +else +libsuffix=.so +endif + if HAVE_W32_SYSTEM GpgmeppConfig.cmake: GpgmeppConfig-w32.cmake.in sed -e 's|[@]resolved_bindir@|$(bindir)|g' < "$<" | \ @@ -77,6 +83,7 @@ else GpgmeppConfig.cmake: GpgmeppConfig.cmake.in sed -e 's|[@]resolved_libdir@|$(libdir)|g' < "$<" | \ + sed -e 's|[@]libsuffix@|$(libsuffix)|g' | \ sed -e 's|[@]resolved_includedir@|$(includedir)|g' > $@ endif install-cmake-files: GpgmeppConfig.cmake GpgmeppConfigVersion.cmake Index: b/lang/qt/src/Makefile.am =================================================================== --- b/lang/qt/src/Makefile.am +++ b/lang/qt/src/Makefile.am @@ -220,6 +220,12 @@ libqgpgme_la_LDFLAGS = -no-undefined -version-info \ @LIBQGPGME_LT_CURRENT@:@LIBQGPGME_LT_REVISION@:@LIBQGPGME_LT_AGE@ +if HAVE_MACOS_SYSTEM +libsuffix=.dylib +else +libsuffix=.so +endif + if HAVE_W32_SYSTEM QGpgmeConfig.cmake: QGpgmeConfig-w32.cmake.in sed -e 's|[@]resolved_bindir@|$(bindir)|g' < "$<" | \ @@ -228,6 +234,7 @@ else 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 Index: b/lang/qt/src/QGpgmeConfig.cmake.in.in =================================================================== --- b/lang/qt/src/QGpgmeConfig.cmake.in.in +++ b/lang/qt/src/QGpgmeConfig.cmake.in.in @@ -64,7 +64,7 @@ set_target_properties(QGpgme PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "@resolved_includedir@/qgpgme;@resolved_includedir@" INTERFACE_LINK_LIBRARIES "Gpgmepp;Qt5::Core" - IMPORTED_LOCATION "@resolved_libdir@/libqgpgme.so" + IMPORTED_LOCATION "@resolved_libdir@/libqgpgme@libsuffix@" ) if(CMAKE_VERSION VERSION_LESS 2.8.12)