diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-06-23 18:23:44 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-06-23 18:23:44 +0400 |
commit | 0c8ebad16ebad4a9ad8592f5ca7a8af43ae1caf0 (patch) | |
tree | 8464d08567b00cbda228c69b9130c0cf11921745 /extern | |
parent | 263be14811c65ee67646308b116c6afd8f817384 (diff) |
add cmake option WITH_SYSTEM_OPENJPEG so linux can build cycles without having libopenjpeg installed.
Diffstat (limited to 'extern')
-rw-r--r-- | extern/CMakeLists.txt | 2 | ||||
-rw-r--r-- | extern/libopenjpeg/image.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt index 67a899082e2..b5f94c06d4c 100644 --- a/extern/CMakeLists.txt +++ b/extern/CMakeLists.txt @@ -48,7 +48,7 @@ if(WITH_GAMEENGINE) add_subdirectory(recastnavigation) endif() -if(WITH_IMAGE_OPENJPEG AND (NOT UNIX OR APPLE)) +if(WITH_IMAGE_OPENJPEG AND (NOT WITH_SYSTEM_OPENJPEG)) add_subdirectory(libopenjpeg) endif() diff --git a/extern/libopenjpeg/image.c b/extern/libopenjpeg/image.c index a4d2c010a56..7c1e7f7faa2 100644 --- a/extern/libopenjpeg/image.c +++ b/extern/libopenjpeg/image.c @@ -86,4 +86,3 @@ void OPJ_CALLCONV opj_image_destroy(opj_image_t *image) { opj_free(image); } } - |