[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23553] trunk/blender/source/creator/ CMakeLists.txt: Fix for CMake/OS X, would fail to copy files to bundle sometimes,

[Brecht Van Lommel]

Revision: 23553
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23553
Author:   blendix
Date:     2009-09-29 11:48:30 +0200 (Tue, 29 Sep 2009)

Log Message:
-----------
Fix for CMake/OS X, would fail to copy files to bundle sometimes,
doing make twice would avoid this, but that's not very convenient.

Modified Paths:
--------------
    trunk/blender/source/creator/CMakeLists.txt

Modified: trunk/blender/source/creator/CMakeLists.txt
===================================================================
--- trunk/blender/source/creator/CMakeLists.txt 2009-09-29 07:51:54 UTC (rev 
23552)
+++ trunk/blender/source/creator/CMakeLists.txt 2009-09-29 09:48:30 UTC (rev 
23553)
@@ -205,9 +205,9 @@
 
                ADD_CUSTOM_COMMAND(
                        TARGET blender POST_BUILD MAIN_DEPENDENCY blender
-                       COMMAND cp -R ${SOURCEINFO} 
${TARGETDIR}/blender.app/Contents/
-                       COMMAND cp -R ${SOURCEDIR}/Contents/PkgInfo 
${TARGETDIR}/blender.app/Contents/
-                       COMMAND cp -R ${SOURCEDIR}/Contents/Resources 
${TARGETDIR}/blender.app/Contents/
+                       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/
                        COMMAND cat ${SOURCEINFO} | sed s/VERSION/`cat 
${CMAKE_SOURCE_DIR}/release/VERSION`/ | sed s/DATE/`date +'%Y-%b-%d'`/ > 
${TARGETINFO}
                        COMMAND rm -Rf 
${TARGETDIR}/blender.app/Contents/MacOS/.blender
                        COMMAND mkdir 
${TARGETDIR}/blender.app/Contents/MacOS/.blender/
@@ -218,8 +218,8 @@
                        ADD_CUSTOM_COMMAND(
                                TARGET blender POST_BUILD MAIN_DEPENDENCY 
blender
                                COMMAND cp 
${CMAKE_SOURCE_DIR}/bin/.blender/.Blanguages 
${TARGETDIR}/blender.app/Contents/MacOS/.blender/
-                               COMMAND cp -R 
${CMAKE_SOURCE_DIR}/bin/.blender/locale 
${TARGETDIR}/blender.app/Contents/Resources/
-                               COMMAND cp -R 
${CMAKE_SOURCE_DIR}/bin/.blender/locale 
${TARGETDIR}/blender.app/Contents/MacOS/.blender/
+                               COMMAND cp -Rf 
${CMAKE_SOURCE_DIR}/bin/.blender/locale 
${TARGETDIR}/blender.app/Contents/Resources/
+                               COMMAND cp -Rf 
${CMAKE_SOURCE_DIR}/bin/.blender/locale 
${TARGETDIR}/blender.app/Contents/MacOS/.blender/
                                COMMAND cp 
${CMAKE_SOURCE_DIR}/bin/.blender/.Blanguages 
${TARGETDIR}/blender.app/Contents/Resources/
                        )
                ENDIF(WITH_INTERNATIONAL)


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs