[Bf-blender-cvs] [491e1ad2257] blender2.8: Fix building without OPENSUBDIV

Dalai Felinto noreply at git.blender.org
Wed Aug 22 14:11:40 CEST 2018


Commit: 491e1ad2257ffabc0b677bfa2bec24bb62cc5bc0
Author: Dalai Felinto
Date:   Wed Aug 22 09:03:40 2018 -0300
Branches: blender2.8
https://developer.blender.org/rB491e1ad2257ffabc0b677bfa2bec24bb62cc5bc0

Fix building without OPENSUBDIV

Although we have a stub system there, we were not linking the library.

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

M	build_files/cmake/macros.cmake

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

diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index 65f962d2dd9..a4f8d9397aa 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -704,6 +704,7 @@ function(SETUP_BLENDER_SORTED_LIBS)
 
 		bf_intern_glew_mx
 		bf_intern_clog
+		bf_intern_opensubdiv
 	)
 
 	if(NOT WITH_SYSTEM_GLOG)
@@ -776,10 +777,6 @@ function(SETUP_BLENDER_SORTED_LIBS)
 		list(APPEND BLENDER_SORTED_LIBS bf_intern_gpudirect)
 	endif()
 
-	if(WITH_OPENSUBDIV OR WITH_CYCLES_OPENSUBDIV)
-		list(APPEND BLENDER_SORTED_LIBS bf_intern_opensubdiv)
-	endif()
-
 	if(WITH_OPENVDB)
 		list(APPEND BLENDER_SORTED_LIBS bf_intern_openvdb)
 	endif()



More information about the Bf-blender-cvs mailing list