From f07038d3acb064da071ce6eeea03a4d3a74cc888 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=BCnther=20Brammer?= <gbrammer@gmx.de>
Date: Fri, 25 Dec 2015 02:36:47 +0100
Subject: [PATCH] CMake: Move Mac OS bundle contents near the generated header
 commands

Both contain resources for the editor GUI, so they fit together.
---
 CMakeLists.txt | 104 ++++++++++++++++++++++++-------------------------
 1 file changed, 51 insertions(+), 53 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a039dd978..24e820c77 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -375,6 +375,56 @@ add_custom_command(
 	VERBATIM
 )
 
+############################################################################
+# Mac OS bundle setup
+############################################################################
+
+if(APPLE)
+	list(APPEND OC_BUNDLE_RESOURCES
+		src/res/oc.icns
+		src/res/ocd.icns src/res/ocf.icns src/res/ocg.icns
+		src/res/C4P.icns src/res/ocs.icns src/res/ocu.icns
+		src/res/Mouse_Trans.png
+		src/res/Cursor_Trans.png
+		src/res/Brush_Trans.png
+		src/res/Play_Trans.png
+		src/res/Halt_Trans.png
+		src/res/Dynamic_Trans.png
+		src/res/Static_Trans.png
+		src/res/Exact_Trans.png
+		src/res/Line_Trans.png
+		src/res/Rect_Trans.png
+		src/res/Fill_Trans.png
+		src/res/Picker_Trans.png
+		src/res/Ift_Trans.png
+		src/res/NoIft_Trans.png
+	)
+
+	if (CMAKE_GENERATOR STREQUAL Xcode)
+		list(APPEND OC_BUNDLE_RESOURCES
+			src/res/MainMenu.xib
+			src/res/FullScreen.xib
+			src/res/EditorGUIWindow.xib
+			src/res/EditorViewport.xib
+			src/res/Editor.xib
+		)
+	else()
+		list(APPEND OC_BUNDLE_RESOURCES
+			src/res/nib/MainMenu.nib
+			src/res/nib/FullScreen.nib
+			src/res/nib/EditorGUIWindow.nib
+			src/res/nib/EditorViewport.nib
+			src/res/nib/Editor.nib
+		)
+	endif()
+
+	# Add icon resources
+	set_source_files_properties(
+		${OC_BUNDLE_RESOURCES}
+		PROPERTIES MACOSX_PACKAGE_LOCATION Resources
+	)
+endif()
+
 ############################################################################
 # List target source files. Don't directly create a target since we condi-
 # tionally add more sources depending on configuration options later.
@@ -828,6 +878,7 @@ if(APPLE)
 		src/platform/StdSchedulerMac.mm
 		src/platform/ObjectiveCAssociated.h
 	)
+	list(APPEND OC_GUI_SOURCES ${OC_BUNDLE_RESOURCES})
 else()
 	list(APPEND OC_SYSTEM_SOURCES
 		src/game/ClonkMain.cpp
@@ -959,59 +1010,6 @@ if(HAVE_PRECOMPILED_HEADERS)
 	endif()
 endif()
 
-############################################################################
-# Mac OS bundle setup
-############################################################################
-
-if(APPLE)
-
-	list(APPEND OC_BUNDLE_RESOURCES
-		src/res/oc.icns
-		src/res/ocd.icns src/res/ocf.icns src/res/ocg.icns
-		src/res/C4P.icns src/res/ocs.icns src/res/ocu.icns
-		src/res/Mouse_Trans.png
-		src/res/Cursor_Trans.png
-		src/res/Brush_Trans.png
-		src/res/Play_Trans.png
-		src/res/Halt_Trans.png
-		src/res/Dynamic_Trans.png
-		src/res/Static_Trans.png
-		src/res/Exact_Trans.png
-		src/res/Line_Trans.png
-		src/res/Rect_Trans.png
-		src/res/Fill_Trans.png
-		src/res/Picker_Trans.png
-		src/res/Ift_Trans.png
-		src/res/NoIft_Trans.png
-	)
-	
-	if (CMAKE_GENERATOR STREQUAL Xcode)
-		list(APPEND OC_BUNDLE_RESOURCES
-			src/res/MainMenu.xib
-			src/res/FullScreen.xib
-			src/res/EditorGUIWindow.xib
-			src/res/EditorViewport.xib
-			src/res/Editor.xib
-		)
-	else()
-		list(APPEND OC_BUNDLE_RESOURCES
-			src/res/nib/MainMenu.nib
-			src/res/nib/FullScreen.nib
-			src/res/nib/EditorGUIWindow.nib
-			src/res/nib/EditorViewport.nib
-			src/res/nib/Editor.nib
-		)
-	endif()
-
-	# Add icon resources
-	set_source_files_properties(
-		${OC_BUNDLE_RESOURCES}
-		PROPERTIES MACOSX_PACKAGE_LOCATION Resources
-	)
-	list(APPEND OC_GUI_SOURCES ${OC_BUNDLE_RESOURCES})
-
-endif()
-
 ############################################################################
 # Generate output files
 ############################################################################