[Bf-blender-cvs] [2df4444] master: CMake: exclude Colamd when OpenNL's disabled

Campbell Barton noreply at git.blender.org
Thu Mar 19 04:49:42 CET 2015


Commit: 2df4444deff15d7e1cb150a201e0ffc9b44d9fd1
Author: Campbell Barton
Date:   Thu Mar 19 14:48:52 2015 +1100
Branches: master
https://developer.blender.org/rB2df4444deff15d7e1cb150a201e0ffc9b44d9fd1

CMake: exclude Colamd when OpenNL's disabled

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

M	extern/CMakeLists.txt

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

diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
index 110c88f..3dc790f 100644
--- a/extern/CMakeLists.txt
+++ b/extern/CMakeLists.txt
@@ -26,11 +26,14 @@
 # Otherwise we get warnings here that we cant fix in external projects
 remove_strict_flags()
 
-add_subdirectory(colamd)
 add_subdirectory(rangetree)
 add_subdirectory(wcwidth)
 add_subdirectory(libmv)
 
+if(WITH_OPENNL)
+	add_subdirectory(colamd)
+endif()
+
 if(WITH_BULLET)
 	if(NOT WITH_SYSTEM_BULLET)
 		add_subdirectory(bullet2)




More information about the Bf-blender-cvs mailing list