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:
authorSergey Sharybin <sergey.vfx@gmail.com>2013-11-16 22:18:21 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2013-11-16 22:18:21 +0400
commit891a037e9b4725b79117f6f2bc469b4b3a2eeeef (patch)
tree4f70517f3a4c048a2b4f37360c767e467308c8a0 /source/creator
parent9c3586d9f91bd796c5347194a24cdc4b1b60c05c (diff)
Skip .git files from submodules for install targets
Also removed .svn checks when it's not longer needed. Some further tweaks (probably for OSX bundler) are likely needed.
Diffstat (limited to 'source/creator')
-rw-r--r--source/creator/CMakeLists.txt6
1 files changed, 2 insertions, 4 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 495399b43cb..cb745d46fa4 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -306,7 +306,7 @@ if(WITH_PYTHON)
install(
DIRECTORY ${CMAKE_SOURCE_DIR}/release/scripts
DESTINATION ${TARGETDIR_VER}
- PATTERN ".svn" EXCLUDE
+ PATTERN ".git" EXCLUDE
PATTERN "__pycache__" EXCLUDE
PATTERN "${ADDON_EXCLUDE_CONDITIONAL}" EXCLUDE
PATTERN "${FREESTYLE_EXCLUDE_CONDITIONAL}" EXCLUDE
@@ -322,7 +322,6 @@ if(WITH_INTERNATIONAL)
DIRECTORY
${CMAKE_SOURCE_DIR}/release/datafiles/fonts
DESTINATION ${TARGETDIR_VER}/datafiles
- PATTERN ".svn" EXCLUDE
)
set(_locale_dir "${CMAKE_SOURCE_DIR}/release/datafiles/locale")
@@ -370,7 +369,6 @@ if(WITH_OPENCOLORIO)
install(
DIRECTORY ${CMAKE_SOURCE_DIR}/release/datafiles/colormanagement
DESTINATION ${TARGETDIR_VER}/datafiles
- PATTERN ".svn" EXCLUDE
)
endif()
@@ -447,7 +445,6 @@ if(UNIX AND NOT APPLE)
${CMAKE_SOURCE_DIR}/release/freedesktop/icons/48x48
${CMAKE_SOURCE_DIR}/release/freedesktop/icons/256x256
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor
- PATTERN ".svn" EXCLUDE
PATTERN "*.svg" EXCLUDE
)
install(
@@ -737,6 +734,7 @@ elseif(APPLE)
install(
DIRECTORY ${from}
DESTINATION ${to}
+ PATTERN ".git" EXCLUDE
PATTERN ".svn" EXCLUDE
PATTERN "*.pyc" EXCLUDE
PATTERN "*.pyo" EXCLUDE