From 0c8ebad16ebad4a9ad8592f5ca7a8af43ae1caf0 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 23 Jun 2012 14:23:44 +0000 Subject: add cmake option WITH_SYSTEM_OPENJPEG so linux can build cycles without having libopenjpeg installed. --- build_files/cmake/macros.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'build_files') diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index 6939f21d461..61a89b568ad 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -193,7 +193,7 @@ macro(SETUP_LIBDIRS) if(WITH_OPENIMAGEIO) link_directories(${OPENIMAGEIO_LIBPATH}) endif() - if(WITH_IMAGE_OPENJPEG AND UNIX AND NOT APPLE) + if(WITH_IMAGE_OPENJPEG AND WITH_SYSTEM_OPENJPEG) link_directories(${OPENJPEG_LIBPATH}) endif() if(WITH_CODEC_QUICKTIME) @@ -303,7 +303,7 @@ macro(setup_liblinks target_link_libraries(${target} ${OPENEXR_LIBRARIES}) endif() endif() - if(WITH_IMAGE_OPENJPEG AND UNIX AND NOT APPLE) + if(WITH_IMAGE_OPENJPEG AND WITH_SYSTEM_OPENJPEG) target_link_libraries(${target} ${OPENJPEG_LIBRARIES}) endif() if(WITH_CODEC_FFMPEG) -- cgit v1.2.3