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:
authorDalai Felinto <dfelinto@gmail.com>2016-10-21 15:22:50 +0300
committerDalai Felinto <dfelinto@gmail.com>2016-10-21 15:22:50 +0300
commitdd23e528176908e02d0698f8ce2774ded9e8bbdc (patch)
treecba2be57e62fb591ecc2721c0a20113129d97361 /build_files
parent224d70c978859bf17c5294c7e0a50b50111141f8 (diff)
parentf7ce482385b760135a36ff778e8c3436cdcf5404 (diff)
Merge remote-tracking branch 'origin/master' into blender2.8
Conflicts: source/blender/blenloader/intern/versioning_defaults.c
Diffstat (limited to 'build_files')
-rw-r--r--build_files/cmake/packaging.cmake2
1 files changed, 2 insertions, 0 deletions
diff --git a/build_files/cmake/packaging.cmake b/build_files/cmake/packaging.cmake
index 1563331387f..c7063ed6772 100644
--- a/build_files/cmake/packaging.cmake
+++ b/build_files/cmake/packaging.cmake
@@ -97,6 +97,8 @@ if(WIN32)
endif()
set(CPACK_PACKAGE_EXECUTABLES "blender" "blender")
+set(CPACK_CREATE_DESKTOP_LINKS "blender" "blender")
+
include(CPack)
# Target for build_archive.py script, to automatically pass along