@@ -1,4 +1,4 @@
-# Locate SDL_mixer library
+# Locate SDL_gfx library
 # This module defines
 # SDLGFX_LIBRARY, the name of the library to link against
 # SDLGFX_FOUND, if false, do not try to link to SDL
 
@@ -1,4 +1,4 @@
-# Locate SDL_mixer library
+# Locate yaml-cpp library
 # This module defines
 # YAMLCPP_LIBRARY, the name of the library to link against
 # YAMLCPP_FOUND, if false, do not try to link to SDL
 
@@ -0,0 +1,31 @@
+# Adapted from the Dolphin project: https://dolphin-emu.org/
+
+# This module can be used in two different ways.
+#
+# When invoked as `cmake -P PostprocessBundle.cmake`, it fixes up an
+# application folder to be standalone. It bundles all required libraries from
+# the system and fixes up library IDs. Any additional shared libraries, like
+# plugins, that are found under Contents/MacOS/ will be made standalone as well.
+#
+# When called with `include(PostprocessBundle)`, it defines a helper
+# function `postprocess_bundle` that sets up the command form of the
+# module as a post-build step.
+
+if(CMAKE_GENERATOR)
+	# Being called as include(PostprocessBundle), so define a helper function.
+	function(postprocess_bundle target path)
+		add_custom_command(TARGET ${target}
+			POST_BUILD
+			COMMAND ${CMAKE_COMMAND} -DBUNDLE_PATH="${path}" -P "${CMAKE_CURRENT_LIST_FILE}"
+		)
+	endfunction()
+	return()
+endif()
+
+# Make sure to fix up any additional shared libraries (like plugins) that are
+# needed.
+file(GLOB_RECURSE BUNDLE_LIBS "${BUNDLE_PATH}/Contents/MacOS/*.dylib")
+
+include(BundleUtilities)
+set(BU_CHMOD_BUNDLE_ITEMS ON)
+fixup_bundle("${BUNDLE_PATH}" "${BUNDLE_LIBS}" "")
@@ -483,8 +483,13 @@ if ( WIN32 )
 endif ()
 
 if ( APPLE AND CREATE_BUNDLE )
-  include ( BundleUtilities )
-  fixup_bundle ( ${EXECUTABLE_OUTPUT_PATH}/openxcom.app "" "" )
+  include ( PostprocessBundle )
+  if ( "${CMAKE_GENERATOR}" STREQUAL "Xcode" )
+    postprocess_bundle ( openxcom ${EXECUTABLE_OUTPUT_PATH}/Debug/openxcom.app )
+	postprocess_bundle ( openxcom ${EXECUTABLE_OUTPUT_PATH}/Release/openxcom.app )
+  else ()
+    postprocess_bundle ( openxcom ${EXECUTABLE_OUTPUT_PATH}/openxcom.app )
+  endif ()
 endif ()
 
 #Setup source groups for IDE
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Locate SDL_mixer library`
	`1`	`+# Locate SDL_gfx library`
`2`	`2`	`# This module defines`
`3`	`3`	`# SDLGFX_LIBRARY, the name of the library to link against`
`4`	`4`	`# SDLGFX_FOUND, if false, do not try to link to SDL`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Locate SDL_mixer library`
	`1`	`+# Locate yaml-cpp library`
`2`	`2`	`# This module defines`
`3`	`3`	`# YAMLCPP_LIBRARY, the name of the library to link against`
`4`	`4`	`# YAMLCPP_FOUND, if false, do not try to link to SDL`