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 /build_files | |
parent | 7fba9eab470783775561308683a839f0aa64f9fb (diff) |
patch from IRIE Shinsuke, use systems openjpeg on *nix.
Diffstat (limited to 'build_files')
-rw-r--r-- | build_files/cmake/RpmBuild.cmake | 17 | ||||
-rw-r--r-- | build_files/cmake/macros.cmake | 6 |
2 files changed, 6 insertions, 17 deletions
diff --git a/build_files/cmake/RpmBuild.cmake b/build_files/cmake/RpmBuild.cmake index 19943fd14cb..90f69d9b334 100644 --- a/build_files/cmake/RpmBuild.cmake +++ b/build_files/cmake/RpmBuild.cmake @@ -15,20 +15,3 @@ else ( RPMBUILD ) message(STATUS "rpmbuild NOT found. RPM generation will not be available") set(RPMBUILD_FOUND "NO") endif ( RPMBUILD ) -# -# VLMC RPM Finder -# Authors: Rohit Yadav <rohityadav89@gmail.com> -# - -find_program(RPMBUILD - NAMES rpmbuild - PATHS "/usr/bin") - -if ( RPMBUILD ) - get_filename_component(RPMBUILD_PATH ${RPMBUILD} ABSOLUTE) - message(STATUS "Found rpmbuild : ${RPMBUILD_PATH}") - set(RPMBUILD_FOUND "YES") -else ( RPMBUILD ) - message(STATUS "rpmbuild NOT found. RPM generation will not be available") - set(RPMBUILD_FOUND "NO") -endif ( RPMBUILD ) diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index b700fdf2cfa..6fd9fda152b 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -85,6 +85,9 @@ macro(SETUP_LIBDIRS) if(WITH_IMAGE_TIFF) link_directories(${TIFF_LIBPATH}) endif() + if(WITH_IMAGE_OPENJPEG AND UNIX AND NOT APPLE) + link_directories(${OPENJPEG_LIBPATH}) + endif() if(WITH_LCMS) link_directories(${LCMS_LIBPATH}) endif() @@ -180,6 +183,9 @@ macro(setup_liblinks target_link_libraries(${target} ${OPENEXR_LIB}) endif() endif() + if(WITH_IMAGE_OPENJPEG AND UNIX AND NOT APPLE) + target_link_libraries(${target} ${OPENJPEG_LIB}) + endif() if(WITH_LCMS) target_link_libraries(${target} ${LCMS_LIBRARY}) endif() |