diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-10-24 14:09:41 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-10-24 18:52:20 +0300 |
| commit | fe253389e027c2da3a0d4ad7304f360be64e27e5 (patch) | |
| tree | fb5ad4c782afa2dd39726002ab87e4f0887bd7f9 /intern/cycles/test | |
| parent | ec49503a3352c5d431bf54e35118222c3c4fd923 (diff) | |
Fix Cycles gtests build on macOS.
Diffstat (limited to 'intern/cycles/test')
| -rw-r--r-- | intern/cycles/test/CMakeLists.txt | 10 |
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) |