diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-09-28 11:34:48 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-09-28 11:34:48 +0400 |
| commit | 4a157de23d43c22abec8bd6922f0355334e413f8 (patch) | |
| tree | c8ca75fef261ce1316ea9042aa4bd689aa4eb584 /source/creator | |
| parent | dbdb58f2a3c0d086afabdacab40c4d83c79e1a04 (diff) | |
| parent | bc593cac2354c863f074d9d51cffb3dca9f499a3 (diff) | |
svn merge ^/trunk/blender -r40587:40643
Diffstat (limited to 'source/creator')
| -rw-r--r-- | source/creator/CMakeLists.txt | 35 |
1 files changed, 11 insertions, 24 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index ccda7e9bb74..e11b4f5562f 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -713,37 +713,24 @@ elseif(APPLE) # 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) - set(TARGETDIR_VER ${TARGETDIR}/blenderplayer.app/Contents/MacOS/${BLENDER_VERSION}) + set(PLAYER_SOURCEDIR ${CMAKE_SOURCE_DIR}/source/darwin/blenderplayer.app) + set(PLAYER_SOURCEINFO ${PLAYER_SOURCEDIR}/Contents/Info.plist) + set(PLAYER_TARGETDIR_VER ${TARGETDIR}/blenderplayer.app/Contents/MacOS/${BLENDER_VERSION}) - # 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. + # important to make a clean install each time else old scripts get loaded. install( CODE - "file(REMOVE_RECURSE ${TARGETDIR_VER})" + "file(REMOVE_RECURSE ${PLAYER_TARGETDIR_VER})" ) - - # message after building. - add_custom_command( - TARGET blender POST_BUILD MAIN_DEPENDENCY blender - COMMAND ${CMAKE_COMMAND} -E echo 'now run: \"make install\" to copy runtime files & scripts to ${TARGETDIR_VER}' - ) - + install( - FILES ${SOURCEDIR}/Contents/PkgInfo + FILES ${PLAYER_SOURCEDIR}/Contents/PkgInfo DESTINATION ${TARGETDIR}/blenderplayer.app/Contents ) - + install_dir( - ${SOURCEDIR}/Contents/Resources + ${PLAYER_SOURCEDIR}/Contents/Resources \${TARGETDIR}/blenderplayer.app/Contents/ ) @@ -759,10 +746,10 @@ elseif(APPLE) # copy extracted python files install_dir( ${CMAKE_CURRENT_BINARY_DIR}/python - \${TARGETDIR_VER} + \${PLAYER_TARGETDIR_VER} ) endif() - + endif() endif() |