Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

CMake

Browse Source 
- temp disable installing plugins dir, since its not used for 2.5x
- OSX wasnt getting text copied.
This commit is contained in:
Campbell Barton
2011-03-09 00:23:26 +00:00
parent 1eb57bcbc7
commit b3ad45aef6
1 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
source/creator/CMakeLists.txt
View File

@@ -193,15 +193,6 @@ endif()
if(WITH_INSTALL) 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(UNIX AND NOT APPLE)
if(WITH_INSTALL_PORTABLE) if(WITH_INSTALL_PORTABLE)
@@ -295,11 +286,13 @@ if(WITH_INSTALL)
) )
endif() endif()
install( # plugins in blender 2.5 don't work at the moment.
DIRECTORY ${CMAKE_SOURCE_DIR}/release/plugins #
DESTINATION ${TARGETDIR_VER}/ # install(
PATTERN ".svn" EXCLUDE # DIRECTORY ${CMAKE_SOURCE_DIR}/release/plugins
) # DESTINATION ${TARGETDIR_VER}/
# PATTERN ".svn" EXCLUDE
# )
if(WITH_PYTHON) if(WITH_PYTHON)
# install(CODE "message(\"copying blender scripts...\")") # install(CODE "message(\"copying blender scripts...\")")
@@ -390,11 +383,13 @@ if(WITH_INSTALL)
PATTERN ".svn" EXCLUDE PATTERN ".svn" EXCLUDE
) )
install( # TODO, copy to linux # plugins in blender 2.5 don't work at the moment.
DIRECTORY ${CMAKE_SOURCE_DIR}/release/plugins #
DESTINATION ${TARGETDIR_VER}/ # install(
PATTERN ".svn" EXCLUDE # DIRECTORY ${CMAKE_SOURCE_DIR}/release/plugins
) # DESTINATION ${TARGETDIR_VER}/
# PATTERN ".svn" EXCLUDE
# )
if(WITH_PYTHON) if(WITH_PYTHON)
# install(CODE "message(\"copying blender scripts...\")") # install(CODE "message(\"copying blender scripts...\")")
@@ -514,10 +509,17 @@ if(WITH_INSTALL)
endif() endif()
elseif(APPLE) elseif(APPLE)
# TODO, APPLE needs a 'make install' target like win32 and unix
set(SOURCEDIR ${CMAKE_SOURCE_DIR}/source/darwin/blender.app) set(SOURCEDIR ${CMAKE_SOURCE_DIR}/source/darwin/blender.app)
set(SOURCEINFO ${SOURCEDIR}/Contents/Info.plist) set(SOURCEINFO ${SOURCEDIR}/Contents/Info.plist)
set(TARGETINFO ${TARGETDIR}/blender.app/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( add_custom_command(
TARGET blender POST_BUILD MAIN_DEPENDENCY blender TARGET blender POST_BUILD MAIN_DEPENDENCY blender
COMMAND cp -Rf ${SOURCEINFO} ${TARGETDIR}/blender.app/Contents/ COMMAND cp -Rf ${SOURCEINFO} ${TARGETDIR}/blender.app/Contents/