Commit: 226fd36ce219b851a8e62a13ba1cb5c73c0dd018
Author: Sergey Sharybin
Date: Tue Aug 7 16:16:55 2018 +0200
Branches: temp-benchmark
https://developer.blender.org/rB226fd36ce219b851a8e62a13ba1cb5c73c0dd018
Tweaks to compilation/installation
===================================================================
M build_files/cmake/config/blender_benchmark.cmake
M source/creator/CMakeLists.txt
===================================================================
diff --git a/build_files/cmake/config/blender_benchmark.cmake
b/build_files/cmake/config/blender_benchmark.cmake
index bbd980e577a..c64fbb329a3 100644
--- a/build_files/cmake/config/blender_benchmark.cmake
+++ b/build_files/cmake/config/blender_benchmark.cmake
@@ -1,3 +1,6 @@
include("${CMAKE_CURRENT_LIST_DIR}/blender_lite.cmake")
set(WITH_PYTHON_INSTALL_NUMPY ON CACHE BOOL "" FORCE)
+# Brecht says: KEEP THIS ENABLED. *SOMETHING* breaks otherwise.
+# Something == DPI. Go figure.
+set(WITH_GHOST_XDND ON CACHE BOOL "" FORCE)
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index f9b978fe1ea..1bae7cae744 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -349,6 +349,9 @@ if(WITH_PYTHON)
PATTERN "addons/*" EXCLUDE
PATTERN "addons_contrib/*" EXCLUDE
PATTERN "freestyle/*" EXCLUDE
+ PATTERN "presets/*" EXCLUDE
+ PATTERN "templates_osl/*" EXCLUDE
+ PATTERN "templates_py/*" EXCLUDE
)
endif()
@@ -409,10 +412,12 @@ if(WITH_OPENCOLORIO)
endif()
# Add default workspaces.blend to build (under [version]/datafiles
+if (False)
install(
FILES ${CMAKE_SOURCE_DIR}/release/datafiles/workspaces.blend
DESTINATION ${TARGETDIR_VER}/datafiles
)
+endif()
# helpful tip when using make
@@ -443,7 +448,13 @@ if(UNIX AND NOT APPLE)
endif()
# there are a few differences between portable and system install
- if(WITH_PYTHON_MODULE)
+ if(True)
+ install(
+ TARGETS blender
+ DESTINATION "."
+ )
+ set(BLENDER_TEXT_FILES_DESTINATION "license")
+ elseif(WITH_PYTHON_MODULE)
if(WITH_INSTALL_PORTABLE)
install(
TARGETS blender
@@ -934,6 +945,8 @@ endif()
if(DEFINED BLENDER_TEXT_FILES_DESTINATION)
+ if (False)
+
install(
CODE
"
@@ -948,6 +961,8 @@ if(DEFINED BLENDER_TEXT_FILES_DESTINATION)
${CMAKE_BINARY_DIR}/release/text/readme.html
)
+ endif()
+
install(
FILES ${BLENDER_TEXT_FILES}
DESTINATION "${BLENDER_TEXT_FILES_DESTINATION}"
@@ -964,6 +979,8 @@ unset(BLENDER_TEXT_FILES_DESTINATION)
# -----------------------------------------------------------------------------
# Geometry Icons
+if(False)
+
# Geometry icons.
get_property(_icon_names GLOBAL PROPERTY ICON_GEOM_NAMES)
set(_icon_files)
@@ -981,14 +998,21 @@ unset(_icon_names)
unset(_icon_files)
unset(_f)
+endif()
+
# -----------------------------------------------------------------------------
# Studio Lights
+
+if(False)
+
install(
DIRECTORY
${CMAKE_SOURCE_DIR}/release/datafiles/studiolights
DESTINATION ${TARGETDIR_VER}/datafiles
)
+endif()
+
# -----------------------------------------------------------------------------
# Setup link libs
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
