[Bf-blender-cvs] [27be9a2] master: CMake: Enable WITH_PYTHON_INSTALL for lite builds
Campbell Barton
noreply at git.blender.org
Sun Oct 11 15:59:35 CEST 2015
Commit: 27be9a2f3bdfc280a612b0d8137e473b2139ea76
Author: Campbell Barton
Date: Mon Oct 12 00:46:54 2015 +1100
Branches: master
https://developer.blender.org/rB27be9a2f3bdfc280a612b0d8137e473b2139ea76
CMake: Enable WITH_PYTHON_INSTALL for lite builds
This is needed to run on OSX and Windows when system python isn't found.
===================================================================
M build_files/cmake/config/blender_lite.cmake
M release/datafiles/locale
M release/scripts/addons
===================================================================
diff --git a/build_files/cmake/config/blender_lite.cmake b/build_files/cmake/config/blender_lite.cmake
index 2a57e4c..9e7b4dc 100644
--- a/build_files/cmake/config/blender_lite.cmake
+++ b/build_files/cmake/config/blender_lite.cmake
@@ -48,7 +48,6 @@ set(WITH_OPENCOLORIO OFF CACHE BOOL "" FORCE)
set(WITH_OPENIMAGEIO OFF CACHE BOOL "" FORCE)
set(WITH_OPENMP OFF CACHE BOOL "" FORCE)
set(WITH_OPENNL OFF CACHE BOOL "" FORCE)
-set(WITH_PYTHON_INSTALL OFF CACHE BOOL "" FORCE)
set(WITH_RAYOPTIMIZATION OFF CACHE BOOL "" FORCE)
set(WITH_SDL OFF CACHE BOOL "" FORCE)
set(WITH_X11_XINPUT OFF CACHE BOOL "" FORCE)
diff --git a/release/datafiles/locale b/release/datafiles/locale
index c651e63..fd35c7b 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit c651e63a9a537624f639950f3127a1dee29205d0
+Subproject commit fd35c7b0d55c59a7dfacc19ed1247379ff8ba049
diff --git a/release/scripts/addons b/release/scripts/addons
index 3fc5b82..4e5235f 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 3fc5b82c6bdba2f9c954fbf497621b9bb794a1bc
+Subproject commit 4e5235fdd424ab132f1414d0bd2c4be42d03a72f
More information about the Bf-blender-cvs
mailing list