diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2011-09-26 11:54:30 +0400 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2011-09-26 11:54:30 +0400 |
| commit | aeafb960b198788b0836e16a70622a4c8863d268 (patch) | |
| tree | 8e3de543b10b210969f1a29160f0bd6866ca316a /source/creator | |
| parent | 8f302f7ffde9f44d7016bae3d74c20b41869b6c7 (diff) | |
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
Diffstat (limited to 'source/creator')
| -rw-r--r-- | source/creator/CMakeLists.txt | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 87fd880ee72..0bd2763c7d2 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -711,6 +711,7 @@ elseif(APPLE) 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 @@ elseif(APPLE) # 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 @@ elseif(APPLE) \${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() |