From afe43136af885f29119e170c8debe301a11abac7 Mon Sep 17 00:00:00 2001
From: Ulrich Huber <ulrich@huberulrich.de>
Date: Tue, 20 Aug 2019 10:19:25 +0200
Subject: [PATCH] Fix incorrectly linked frameworks

---
 CMakeLists.txt | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8b64c618..a7586c8e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -57,8 +57,8 @@ endif ()
 ## Libraries ##
 
 macro (add_includes_ldflags LDFLAGS INCLUDES)
-    set (xournalpp_LDFLAGS ${xournalpp_LDFLAGS} ${LDFLAGS})
-    set (xournalpp_INCLUDE_DIRS ${xournalpp_INCLUDE_DIRS} ${INCLUDES})
+    set (xournalpp_LDFLAGS ${xournalpp_LDFLAGS} "${LDFLAGS}")
+    set (xournalpp_INCLUDE_DIRS ${xournalpp_INCLUDE_DIRS} "${INCLUDES}")
 endmacro (add_includes_ldflags LDFLAGS INCLUDES)
 
 # GLIB
@@ -104,7 +104,6 @@ add_includes_ldflags ("${PORTAUDIOCPP_LDFLAGS}" "${PORTAUDIOCPP_INCLUDE_DIRS}")
 pkg_check_modules(SNDFILE REQUIRED "sndfile >= 1.0.25")
 add_includes_ldflags ("${SNDFILE_LDFLAGS}" "${SNDFILE_INCLUDE_DIRS}")
 
-
 ## Additional features ##
 
 # CppUnit
@@ -134,6 +133,14 @@ if (Lua_FOUND)
 	set (ENABLE_PLUGINS "true")
 endif ()
 
+#
+# DO NOT INCLUDE LIBRARIES WITH pkg_check_modules AFTER THIS LINE!!!
+#
+if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+    # Fix linker flag handling for MacOS builds where frameworks are separated from their flag
+    string(REPLACE "-framework;" "-framework " xournalpp_LDFLAGS "${xournalpp_LDFLAGS}")
+endif()
+
 configure_file (
   src/config-features.h.in
   src/config-features.h