diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-02-15 22:04:51 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-02-15 22:04:51 +0300 |
| commit | c461a7ea4df3f69722240a1ecc5f7501ce2c8611 (patch) | |
| tree | 707050ad519960b540d2a7805794f7bc873270af /CMakeLists.txt | |
| parent | 7fba9eab470783775561308683a839f0aa64f9fb (diff) | |
patch from IRIE Shinsuke, use systems openjpeg on *nix.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 349bbe23ac0..7d60bb70ab5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -933,8 +933,15 @@ if(WITH_RAYOPTIMIZATION) endif() if(WITH_IMAGE_OPENJPEG) - set(OPENJPEG ${CMAKE_SOURCE_DIR}/extern/libopenjpeg) - set(OPENJPEG_INC ${OPENJPEG}) + if(UNIX AND NOT APPLE) + set(OPENJPEG /usr) + set(OPENJPEG_INC ${OPENJPEG}/include) + set(OPENJPEG_LIB openjpeg) + set(OPENJPEG_LIBPATH ${OPENJPEG}/lib) + else() + set(OPENJPEG ${CMAKE_SOURCE_DIR}/extern/libopenjpeg) + set(OPENJPEG_INC ${OPENJPEG}) + endif() endif() if(WITH_IMAGE_REDCODE) |