[Bf-blender-cvs] [33bac1f] master: CMake: use same defaults on all-platforms

Campbell Barton noreply at git.blender.org
Tue Jul 28 06:53:50 CEST 2015


Commit: 33bac1f40140748c5f8b3e045ba77a9618ada6e4
Author: Campbell Barton
Date:   Tue Jul 28 14:45:28 2015 +1000
Branches: master
https://developer.blender.org/rB33bac1f40140748c5f8b3e045ba77a9618ada6e4

CMake: use same defaults on all-platforms

Previously Linux had disabled libs that were enabled on other platforms.
Use a reduced feature set on all, since libs such as Jack & OSL aren't totally reliable on Win/OSX.

Keep 'option_defaults_init' since platform maintainers may want to adjust later.

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

M	CMakeLists.txt

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 712e16d..5654eb3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -160,8 +160,11 @@ option_defaults_init(
 	_init_GAMEENGINE
 )
 
+# NOTE: for now use same defaults on all platforms...
+# in future we may want to tweak per-platform
+
 # customize...
-if(UNIX AND NOT APPLE)
+if (1)
 	# some of these libraries are problematic on Linux
 	# disable less important dependencies by default
 	set(_init_BUILDINFO                      OFF)




More information about the Bf-blender-cvs mailing list