[Bf-blender-cvs] [2396d7faa59] master: Build system: disable Draco when not installing python.

Bastien Montagne noreply at git.blender.org
Fri Apr 12 14:30:46 CEST 2019


Commit: 2396d7faa59c8e64c17b13ac19ef97854389afcc
Author: Bastien Montagne
Date:   Fri Apr 12 14:26:17 2019 +0200
Branches: master
https://developer.blender.org/rB2396d7faa59c8e64c17b13ac19ef97854389afcc

Build system: disable Draco when not installing python.

Draco py binding needs to be installed somewhere, when not installing
Python itself it's breaking the installation (since it creates a fake
empty py install, which will crash when trying to start Blender).

We could fix that in some smarter way maybe, but for now it's simpler to
just not care about Draco when we are not installing Python.

===================================================================

M	CMakeLists.txt

===================================================================

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7cec28f0e10..2f5b8240c88 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -640,6 +640,11 @@ if(NOT WITH_PYTHON)
 	set(WITH_DRACO OFF)
 endif()
 
+if(WITH_DRACO AND NOT WITH_PYTHON_INSTALL)
+	message(STATUS "WITH_DRACO requires WITH_PYTHON_INSTALL to be ON, disabling WITH_DRACO for now")
+	set(WITH_DRACO OFF)
+endif()
+
 # enable boost for cycles, audaspace or i18n
 # otherwise if the user disabled
 if(NOT WITH_BOOST)



More information about the Bf-blender-cvs mailing list