[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40555] trunk/blender/source: OSX - cmake: blenderplayer part 2: Jens Verwiever co-patch

[Dalai Felinto]

Revision: 40555
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40555
Author:   dfelinto
Date:     2011-09-26 07:54:30 +0000 (Mon, 26 Sep 2011)
Log Message:
-----------
OSX - cmake: blenderplayer part 2: Jens Verwiever co-patch
Using OSX Bundle (in oppose to Blender dummy .app) as start point for binary.
That way we don't need to move the blenderplayer after the bundle is finished and we can rebuild it without doing `make install`
I will test more tomorrow, but it should be working now

Modified Paths:
--------------
    trunk/blender/source/blenderplayer/CMakeLists.txt
    trunk/blender/source/creator/CMakeLists.txt

Modified: trunk/blender/source/blenderplayer/CMakeLists.txt
===================================================================
--- trunk/blender/source/blenderplayer/CMakeLists.txt	2011-09-26 07:39:29 UTC (rev 40554)
+++ trunk/blender/source/blenderplayer/CMakeLists.txt	2011-09-26 07:54:30 UTC (rev 40555)
@@ -63,6 +63,8 @@
 	endif()
 
 	add_executable(blenderplayer ${EXETYPE} ${CMAKE_CURRENT_BINARY_DIR}/dna.c ../icons/winblender.rc)
+elseif(APPLE)
+	add_executable(blenderplayer MACOSX_BUNDLE ${CMAKE_CURRENT_BINARY_DIR}/dna.c)
 else()
 	add_executable(blenderplayer ${CMAKE_CURRENT_BINARY_DIR}/dna.c)
 endif()

Modified: trunk/blender/source/creator/CMakeLists.txt
===================================================================
--- trunk/blender/source/creator/CMakeLists.txt	2011-09-26 07:39:29 UTC (rev 40554)
+++ trunk/blender/source/creator/CMakeLists.txt	2011-09-26 07:54:30 UTC (rev 40555)
@@ -711,6 +711,7 @@
 	endif()
 
 	# install blenderplayer bundle - copy of blender.app above. re-using macros et al
+	# note we are using OSX Bundle as base and copying Blender dummy bundle on top of it
 	if(WITH_GAMEENGINE AND WITH_PLAYER)
 		set(SOURCEDIR ${CMAKE_SOURCE_DIR}/source/darwin/blenderplayer.app)
 		set(SOURCEINFO ${SOURCEDIR}/Contents/Info.plist)
@@ -719,6 +720,11 @@
 		# setup Info.plist
 		execute_process(COMMAND date "+%Y-%m-%d" OUTPUT_VARIABLE BLENDER_DATE OUTPUT_STRIP_TRAILING_WHITESPACE)
 
+		set_target_properties(blender PROPERTIES
+			MACOSX_BUNDLE_INFO_PLIST ${SOURCEINFO}
+			MACOSX_BUNDLE_SHORT_VERSION_STRING ${BLENDER_VERSION}
+			MACOSX_BUNDLE_LONG_VERSION_STRING "${BLENDER_VERSION} ${BLENDER_DATE}")
+
 		# important to make a clean install each time else old scripts get loaded.
 		install(
 			CODE
@@ -756,14 +762,6 @@
 				\${TARGETDIR_VER}
 			)
 		endif()
-
-		# This is a hack. Blender is linked to the right place (inside the .app)
-		# blenderplayer not ... that also means blenderplayer is in the right place
-		# only when we do make install. XXX to be fixed.
-		install(
-			CODE
-			"file(RENAME ${TARGETDIR}/blenderplayer ${TARGETDIR}/blenderplayer.app/Contents/MacOS/blenderplayer)"
-		)
 	
 	endif()
 endif()