Fix Cycles gtests build on macOS.

2017-10-24 13:09:41 +02:00
parent ec49503a33
commit fe253389e0
2 changed files with 8 additions and 5 deletions
--- a/intern/cycles/test/CMakeLists.txt
+++ b/intern/cycles/test/CMakeLists.txt
@@ -42,10 +42,12 @@ if(WITH_CYCLES_OSL)
 		${LLVM_LIBRARIES}
 	)
 endif()
-if(WITH_IMAGE_OPENJPEG AND NOT WITH_SYSTEM_OPENJPEG)
-	list(APPEND ALL_CYCLES_LIBRARIES
-		extern_openjpeg
-	)
+if(WITH_IMAGE_OPENJPEG)
+	if(WITH_SYSTEM_OPENJPEG)
+		list(APPEND ALL_CYCLES_LIBRARIES ${OPENJPEG_LIBRARIES})
+	else()
+		list(APPEND ALL_CYCLES_LIBRARIES extern_openjpeg)
+	endif()
 endif()
 if(WITH_CYCLES_OPENSUBDIV)
 	add_definitions(-DWITH_OPENSUBDIV)