Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartijn Berger <martijn.berger@gmail.com>2014-11-13 19:09:09 +0300
committerMartijn Berger <martijn.berger@gmail.com>2014-11-13 19:09:47 +0300
commit15a7a5a08cd0d6c08feeb158a9f81af4114e3f57 (patch)
tree71bb703af64a9716118e98cb3fbbf037a54bc21e /CMakeLists.txt
parent1ddfe6676de1b382d2c9b06cc9c68f50659d13de (diff)
CMake buildbot change upload should work now
CPack generating NSIS and WiX installers should also work
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt6
1 files changed, 0 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6fe89022342..38ddc8d0ad9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1703,12 +1703,6 @@ elseif(WIN32)
endif()
endif()
- set(CPACK_PACKAGE_INSTALL_DIRECTORY "Blender Foundation/Blender")
- set(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "Blender Foundation/Blender")
- set(CPACK_WIX_LICENSE_RTF ${CMAKE_SOURCE_DIR}/release/text/GPL-license.rtf)
- set(CPACK_WIX_PRODUCT_ICON ${CMAKE_SOURCE_DIR}/source/icons/winblender.ico)
- set(CPACK_WIX_UPGRADE_GUID "B767E4FD-7DE7-4094-B051-3AE62E13A17A")
-
elseif(APPLE)
if(${CMAKE_OSX_DEPLOYMENT_TARGET} STREQUAL "10.5" OR ${CMAKE_OSX_DEPLOYMENT_TARGET} STRGREATER "10.5")