From e7e05ba5fa8de4cf6519e91dd46d73ba985a7fae Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 16 Apr 2019 13:57:03 +0200 Subject: CMake: fix linking with gtest & cycles enabled --- source/blender/python/intern/CMakeLists.txt | 7 ++++++- source/blender/python/intern/bpy_interface.c | 4 +++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/source/blender/python/intern/CMakeLists.txt b/source/blender/python/intern/CMakeLists.txt index 3563300b515..95f3edb8045 100644 --- a/source/blender/python/intern/CMakeLists.txt +++ b/source/blender/python/intern/CMakeLists.txt @@ -33,7 +33,6 @@ set(INC ../../../../intern/clog ../../../../intern/guardedalloc ../../../../intern/opencolorio - ../../../../intern/cycles/blender ) set(INC_SYS @@ -167,6 +166,12 @@ if(WITH_COMPOSITOR) endif() if(WITH_CYCLES) + list(APPEND INC + ../../../../intern/cycles/blender + ) + list(APPEND LIB + bf_intern_cycles + ) add_definitions(-DWITH_CYCLES) endif() diff --git a/source/blender/python/intern/bpy_interface.c b/source/blender/python/intern/bpy_interface.c index e07e39642e9..61ddf46d896 100644 --- a/source/blender/python/intern/bpy_interface.c +++ b/source/blender/python/intern/bpy_interface.c @@ -57,7 +57,9 @@ #include "BKE_main.h" #include "BKE_text.h" -#include "CCL_api.h" +#ifdef WITH_CYCLES +# include "CCL_api.h" +#endif #include "BPY_extern.h" -- cgit v1.2.3