diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2009-11-08 02:10:18 +0300 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2009-11-08 02:10:18 +0300 |
| commit | 2ead17843c08c9c4ed211010c0ad4d2a5c31a99c (patch) | |
| tree | 0fc77499284278cdf8b017eac803910c87b4e07a /source/creator | |
| parent | cfa4f3222a427eff1991e8fd2c341ce4ca5385bd (diff) | |
| parent | 4e9699debff6b0ac7e3bfc91d615e071218a67db (diff) | |
merge with trunk/2.5 at r24378
Diffstat (limited to 'source/creator')
| -rw-r--r-- | source/creator/CMakeLists.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 5f352e1d67b..dc679101fa5 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -207,7 +207,6 @@ IF(APPLE) ADD_CUSTOM_COMMAND( TARGET blender POST_BUILD MAIN_DEPENDENCY blender COMMAND find ${TARGETDIR} -name .svn -prune -exec rm -rf {} "\;" - COMMAND find ${TARGETDIR} -name __MACOSX -prune -exec rm -rf {} "\;" ) @@ -344,6 +343,7 @@ IF(WIN32) TARGET blender POST_BUILD MAIN_DEPENDENCY blender COMMAND find ${TARGETDIR}/blender.app -name .DS_Store -prune -exec rm -rf {} "\;" COMMAND find ${TARGETDIR}/blender.app -name .svn -prune -exec rm -rf {} "\;" + COMMAND find ${TARGETDIR}/blender.app -name __MACOSX -prune -exec rm -rf {} "\;" ) ENDIF(APPLE) >>>>>>> .merge-right.r23146 @@ -590,7 +590,9 @@ IF(UNIX) bf_cineon bf_openexr bf_dds - bf_readblenfile + bf_readblenfile + bf_collada + blender_BSP blender_bop bf_kernel bf_decimation |