patch from IRIE Shinsuke, use systems openjpeg on *nix.
This commit is contained in:
parent
7fba9eab47
commit
c461a7ea4d
@ -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)
|
||||
|
@ -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 )
|
||||
|
@ -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()
|
||||
|
2
extern/CMakeLists.txt
vendored
2
extern/CMakeLists.txt
vendored
@ -37,7 +37,7 @@ endif()
|
||||
|
||||
add_subdirectory(glew)
|
||||
|
||||
if(WITH_IMAGE_OPENJPEG)
|
||||
if(WITH_IMAGE_OPENJPEG AND (NOT UNIX OR APPLE))
|
||||
add_subdirectory(libopenjpeg)
|
||||
endif()
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user