Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'intern/cycles/test/CMakeLists.txt')
-rw-r--r--intern/cycles/test/CMakeLists.txt10
1 files changed, 6 insertions, 4 deletions
diff --git a/intern/cycles/test/CMakeLists.txt b/intern/cycles/test/CMakeLists.txt
index f4213c508fc..f3e49dc0c4e 100644
--- 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)