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:
authorCampbell Barton <ideasman42@gmail.com>2018-05-22 09:49:24 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-05-22 09:49:24 +0300
commitbb45381bc2e4cfe16ac2e7dd2df6fc2bec9ed614 (patch)
tree369b7dfa4f9420e3004f0e7dc7eff0350b3b5a25 /source/creator
parent4e14437cb0ab4beb3a4d4206ac0330a311cbb4c7 (diff)
parent28c20fc3934b404cbce8a9181ae536803abf9444 (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/creator')
-rw-r--r--source/creator/CMakeLists.txt21
1 files changed, 18 insertions, 3 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 8240b27f2cf..367180407ba 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -259,15 +259,30 @@ endif()
set(BLENDER_TEXT_FILES
${CMAKE_SOURCE_DIR}/release/text/GPL-license.txt
${CMAKE_SOURCE_DIR}/release/text/GPL3-license.txt
- ${CMAKE_SOURCE_DIR}/release/text/Python-license.txt
${CMAKE_SOURCE_DIR}/release/text/copyright.txt
- ${CMAKE_SOURCE_DIR}/release/text/jemalloc-license.txt
- ${CMAKE_SOURCE_DIR}/release/text/ocio-license.txt
# generate this file
# ${CMAKE_SOURCE_DIR}/release/text/readme.html
${CMAKE_SOURCE_DIR}/release/datafiles/LICENSE-bfont.ttf.txt
)
+if(WITH_PYTHON)
+ list(APPEND BLENDER_TEXT_FILES
+ ${CMAKE_SOURCE_DIR}/release/text/Python-license.txt
+ )
+endif()
+
+if(WITH_OPENCOLORIO)
+ list(APPEND BLENDER_TEXT_FILES
+ ${CMAKE_SOURCE_DIR}/release/text/ocio-license.txt
+ )
+endif()
+
+if(WITH_MEM_JEMALLOC)
+ list(APPEND BLENDER_TEXT_FILES
+ ${CMAKE_SOURCE_DIR}/release/text/jemalloc-license.txt
+ )
+endif()
+
if(WITH_INTERNATIONAL)
list(APPEND BLENDER_TEXT_FILES
${CMAKE_SOURCE_DIR}/release/datafiles/LICENSE-droidsans.ttf.txt