[Bf-blender-cvs] [3563276] master: Revert "OSX/cpack: add a dummy bg and ds_store for dmg"

Campbell Barton noreply at git.blender.org
Tue Nov 18 11:40:22 CET 2014


Commit: 3563276d707f44d524dc9b23339390a538f811a7
Author: Campbell Barton
Date:   Tue Nov 18 11:39:54 2014 +0100
Branches: master
https://developer.blender.org/rB3563276d707f44d524dc9b23339390a538f811a7

Revert "OSX/cpack: add a dummy bg and ds_store for dmg"

This reverts commit 5f7b273236fc09ad4752529b964e0e1d6c681979.

Binary files for release should be added to svn lib from now on.

===================================================================

M	build_files/cmake/packaging.cmake
D	release/darwin/SET_DS_Store
D	release/darwin/background.png

===================================================================

diff --git a/build_files/cmake/packaging.cmake b/build_files/cmake/packaging.cmake
index 3f442c0..95bbb2b 100644
--- a/build_files/cmake/packaging.cmake
+++ b/build_files/cmake/packaging.cmake
@@ -59,8 +59,6 @@ if(APPLE)
 
 	# Libraries are bundled directly
 	set(CPACK_COMPONENT_LIBRARIES_HIDDEN TRUE)
-	set(CPACK_DMG_BACKGROUND_IMAGE "${CMAKE_SOURCE_DIR}/release/darwin/background.png")
-	set(CPACK_DMG_DS_STORE "${CMAKE_SOURCE_DIR}/release/darwin/SET_DS_Store")
 endif()
 
 if(WIN32)
diff --git a/release/darwin/SET_DS_Store b/release/darwin/SET_DS_Store
deleted file mode 100644
index 80bc4c2..0000000
Binary files a/release/darwin/SET_DS_Store and /dev/null differ
diff --git a/release/darwin/background.png b/release/darwin/background.png
deleted file mode 100644
index 7777ed9..0000000
Binary files a/release/darwin/background.png and /dev/null differ




More information about the Bf-blender-cvs mailing list