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

Merged changes in the trunk up to revision 34574.

Browse Source
This commit is contained in:
Tamito Kajiyama
2011-01-30 23:41:58 +00:00
parent 50ced6b017 d5c7231339
commit 4e9a519e22
409 changed files with 3606 additions and 14373 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/creator/CMakeLists.txt
View File

@@ -306,6 +306,7 @@ if(WITH_INSTALL)
endif()
if(WITH_PYTHON)
# note, as far as python is concerned 'RelWithDebInfo' is not debug since its without debug flags.
if(NOT CMAKE_BUILD_TYPE) # hack: with multi-configuration generator this is "", so for now copy both python31.dll/zip and python31_d.dll/zip
add_custom_command(TARGET blender
POST_BUILD
@@ -323,7 +324,7 @@ if(WITH_INSTALL)
COMMAND if \"$(ConfigurationName)\" == \"MinSizeRel\" xcopy /E /Y \"${LIBDIR}\\release\\python31\\*.*\" \"${TARGETDIR}\\${BLENDER_VERSION}\\python\\lib\\\"
)
else()
if(CMAKE_BUILD_TYPE STREQUAL Debug OR CMAKE_BUILD_TYPE STREQUAL RelWithDebInfo)
if(CMAKE_BUILD_TYPE STREQUAL Debug)
add_custom_command(TARGET blender
POST_BUILD
MAIN_DEPENDENCY blender