diff options
| author | Arto Kitula <arto.kitula@gmail.com> | 2017-09-21 22:09:52 +0300 |
|---|---|---|
| committer | Arto Kitula <arto.kitula@gmail.com> | 2017-09-21 22:09:52 +0300 |
| commit | 78345a46c18a8ac73e062809ebb6dea00b63e86d (patch) | |
| tree | 03c221b30640288c12999edc7bd493947fffae30 /build_files | |
| parent | 9775c4d68ba95b4581d61653191b3f1206ba1b69 (diff) | |
deps build: add openjpeg to OIIO
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/build_environment/cmake/openimageio.cmake | 6 | ||||
| -rw-r--r-- | build_files/build_environment/cmake/openjpeg.cmake | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/build_files/build_environment/cmake/openimageio.cmake b/build_files/build_environment/cmake/openimageio.cmake index f323161d5f2..b36e883e93c 100644 --- a/build_files/build_environment/cmake/openimageio.cmake +++ b/build_files/build_environment/cmake/openimageio.cmake @@ -59,7 +59,7 @@ set(OPENIMAGEIO_EXTRA_ARGS -DUSE_GIF=OFF -DUSE_OPENCV=OFF -DUSE_OPENSSL=OFF - -DUSE_OPENJPEG=OFF + -DUSE_OPENJPEG=ON -DUSE_FFMPEG=OFF -DUSE_PTEX=OFF -DUSE_FREETYPE=OFF @@ -78,6 +78,8 @@ set(OPENIMAGEIO_EXTRA_ARGS -DTIFF_INCLUDE_DIR=${LIBDIR}/tiff/include -DJPEG_LIBRARY=${LIBDIR}/jpg/lib/${JPEG_LIBRARY} -DJPEG_INCLUDE_DIR=${LIBDIR}/jpg/include + -DOPENJPEG_INCLUDE_DIR=${LIBDIR}/openjpeg/include/openjpeg-${OPENJPEG_VERSION} + -DOPENJPEG_LIBRARY=${LIBDIR}/openjpeg/lib/${OPENJPEG_LIBRARY} -DOCIO_PATH=${LIBDIR}/opencolorio/ -DOpenEXR_USE_STATIC_LIBS=On -DOPENEXR_HOME=${LIBDIR}/openexr/ @@ -107,7 +109,7 @@ ExternalProject_Add(external_openimageio INSTALL_DIR ${LIBDIR}/openimageio ) -add_dependencies(external_openimageio external_png external_zlib external_ilmbase external_openexr external_jpeg external_boost external_tiff external_webp external_opencolorio) +add_dependencies(external_openimageio external_png external_zlib external_ilmbase external_openexr external_jpeg external_boost external_tiff external_webp external_opencolorio external_openjpeg) if(NOT WIN32) add_dependencies(external_openimageio external_opencolorio_extra) endif() diff --git a/build_files/build_environment/cmake/openjpeg.cmake b/build_files/build_environment/cmake/openjpeg.cmake index 66f815034eb..0183b11cf41 100644 --- a/build_files/build_environment/cmake/openjpeg.cmake +++ b/build_files/build_environment/cmake/openjpeg.cmake @@ -38,6 +38,7 @@ ExternalProject_Add(external_openjpeg INSTALL_DIR ${LIBDIR}/openjpeg ) + set(OPENJPEG_LIBRARY libopenjpeg${LIBEXT}) if(MSVC) set_target_properties(external_openjpeg PROPERTIES FOLDER Mingw) endif(MSVC) |