diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-03-09 03:23:26 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-03-09 03:23:26 +0300 |
| commit | b3ad45aef6409669bed8ae8b88e74ca9d12b3d72 (patch) | |
| tree | 201f73c86953df8fc41de0939766a4200bac6d4b /source/creator | |
| parent | 1eb57bcbc7e3dd4122d882436c5f98e667f7ffbf (diff) | |
CMake
- temp disable installing plugins dir, since its not used for 2.5x
- OSX wasnt getting text copied.
Diffstat (limited to 'source/creator')
| -rw-r--r-- | source/creator/CMakeLists.txt | 40 |
1 files changed, 21 insertions, 19 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 9c58645172d..85d2dad66b3 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -193,15 +193,6 @@ endif() if(WITH_INSTALL) - if(UNIX) - add_custom_command(TARGET blender - POST_BUILD - MAIN_DEPENDENCY blender - #COMMAND cp -R ${CMAKE_SOURCE_DIR}/release/plugins ${TARGETDIR}/ - #COMMAND cp -R ${CMAKE_SOURCE_DIR}/release/text/* ${TARGETDIR}/ - ) - endif() - if(UNIX AND NOT APPLE) if(WITH_INSTALL_PORTABLE) @@ -295,11 +286,13 @@ if(WITH_INSTALL) ) endif() - install( - DIRECTORY ${CMAKE_SOURCE_DIR}/release/plugins - DESTINATION ${TARGETDIR_VER}/ - PATTERN ".svn" EXCLUDE - ) + # plugins in blender 2.5 don't work at the moment. + # + # install( + # DIRECTORY ${CMAKE_SOURCE_DIR}/release/plugins + # DESTINATION ${TARGETDIR_VER}/ + # PATTERN ".svn" EXCLUDE + # ) if(WITH_PYTHON) # install(CODE "message(\"copying blender scripts...\")") @@ -390,11 +383,13 @@ if(WITH_INSTALL) PATTERN ".svn" EXCLUDE ) - install( # TODO, copy to linux - DIRECTORY ${CMAKE_SOURCE_DIR}/release/plugins - DESTINATION ${TARGETDIR_VER}/ - PATTERN ".svn" EXCLUDE - ) + # plugins in blender 2.5 don't work at the moment. + # + # install( + # DIRECTORY ${CMAKE_SOURCE_DIR}/release/plugins + # DESTINATION ${TARGETDIR_VER}/ + # PATTERN ".svn" EXCLUDE + # ) if(WITH_PYTHON) # install(CODE "message(\"copying blender scripts...\")") @@ -514,12 +509,19 @@ if(WITH_INSTALL) endif() elseif(APPLE) + # TODO, APPLE needs a 'make install' target like win32 and unix + set(SOURCEDIR ${CMAKE_SOURCE_DIR}/source/darwin/blender.app) set(SOURCEINFO ${SOURCEDIR}/Contents/Info.plist) set(TARGETINFO ${TARGETDIR}/blender.app/Contents/Info.plist) add_custom_command( TARGET blender POST_BUILD MAIN_DEPENDENCY blender + COMMAND cp -R ${CMAKE_SOURCE_DIR}/release/text/* ${TARGETDIR}/ + ) + + add_custom_command( + TARGET blender POST_BUILD MAIN_DEPENDENCY blender COMMAND cp -Rf ${SOURCEINFO} ${TARGETDIR}/blender.app/Contents/ COMMAND cp -Rf ${SOURCEDIR}/Contents/PkgInfo ${TARGETDIR}/blender.app/Contents/ COMMAND cp -Rf ${SOURCEDIR}/Contents/Resources ${TARGETDIR}/blender.app/Contents/ |