[Bf-blender-cvs] [308cc49] master: Cycles: Fix compilation on Cycles unit tests after recent changes
Sergey Sharybin
noreply at git.blender.org
Mon Aug 8 15:10:17 CEST 2016
Commit: 308cc491cd768c4a0a3bbc0c561904f42b4c52b7
Author: Sergey Sharybin
Date: Mon Aug 8 15:09:34 2016 +0200
Branches: master
https://developer.blender.org/rB308cc491cd768c4a0a3bbc0c561904f42b4c52b7
Cycles: Fix compilation on Cycles unit tests after recent changes
===================================================================
M intern/cycles/test/CMakeLists.txt
===================================================================
diff --git a/intern/cycles/test/CMakeLists.txt b/intern/cycles/test/CMakeLists.txt
index 80fe893..9af777f 100644
--- a/intern/cycles/test/CMakeLists.txt
+++ b/intern/cycles/test/CMakeLists.txt
@@ -26,6 +26,7 @@ set(ALL_CYCLES_LIBRARIES
cycles_device
cycles_bvh
cycles_graph
+ cycles_subd
cycles_util
${OPENIMAGEIO_LIBRARIES}
)
@@ -41,6 +42,16 @@ if(WITH_IMAGE_OPENJPEG AND NOT WITH_SYSTEM_OPENJPEG)
extern_openjpeg
)
endif()
+if(WITH_CYCLES_OPENSUBDIV)
+ add_definitions(-DWITH_OPENSUBDIV)
+ include_directories(
+ SYSTEM
+ ${OPENSUBDIV_INCLUDE_DIR}
+ )
+ list(APPEND ALL_CYCLES_LIBRARIES
+ ${OPENSUBDIV_LIBRARIES}
+ )
+endif()
list(APPEND ALL_CYCLES_LIBRARIES
${BOOST_LIBRARIES}
)
More information about the Bf-blender-cvs
mailing list