[Bf-blender-cvs] [965c135] master: CMake: only enable opencollada by default on OS X and Windows, consistent with scons.

Brecht Van Lommel noreply at git.blender.org
Tue Nov 19 00:44:12 CET 2013


Commit: 965c1357c4ef78142dee73b09e52f5d86a5e840f
Author: Brecht Van Lommel
Date:   Mon Nov 18 17:12:19 2013 +0100
http://developer.blender.org/rB965c1357c4ef78142dee73b09e52f5d86a5e840f

CMake: only enable opencollada by default on OS X and Windows, consistent with scons.

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

M	CMakeLists.txt

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fdea7e3..d3a4d65 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -226,8 +226,12 @@ else()
 endif()
 
 # 3D format support
-# disable opencollada on non-apple unix because opencollada has no package for debian
-option(WITH_OPENCOLLADA		"Enable OpenCollada Support (http://www.opencollada.org)"	ON)
+# Disable opencollada when we don't have precompiled libs
+if(APPLE OR WIN32)
+	option(WITH_OPENCOLLADA		"Enable OpenCollada Support (http://www.opencollada.org)" ON)
+else()
+	option(WITH_OPENCOLLADA		"Enable OpenCollada Support (http://www.opencollada.org)" OFF)
+endif()
 
 # Sound output
 option(WITH_SDL           "Enable SDL for sound and joystick support" ON)




More information about the Bf-blender-cvs mailing list