CMake: fix linking with gtest & cycles enabled

This commit is contained in:
Campbell Barton 2019-04-16 13:57:03 +02:00
parent 423d9086e6
commit e7e05ba5fa
2 changed files with 9 additions and 2 deletions

View File

@ -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()

View File

@ -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"