diff options
author | Ray Molenkamp <github@lazydodo.com> | 2017-09-22 22:57:21 +0300 |
---|---|---|
committer | Ray Molenkamp <github@lazydodo.com> | 2017-09-22 22:57:21 +0300 |
commit | 0e802fabb406e334a8cb1dad428e6fdac72ff7e5 (patch) | |
tree | c2e7d2ad928889bd8eb61b6bcf7cf94e10c9e786 /build_files/build_environment/cmake/openjpeg.cmake | |
parent | 925f2c8b9d2ac766d697e8b840e1715b67e6ceeb (diff) |
[cmake/deps_builder] update openjpeg to 1.5.2 to match the version in master/extern , add support for openjpeg in oiio. Mark webp as an optional component.
Diffstat (limited to 'build_files/build_environment/cmake/openjpeg.cmake')
-rw-r--r-- | build_files/build_environment/cmake/openjpeg.cmake | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/build_files/build_environment/cmake/openjpeg.cmake b/build_files/build_environment/cmake/openjpeg.cmake index 0183b11cf41..406badf31fe 100644 --- a/build_files/build_environment/cmake/openjpeg.cmake +++ b/build_files/build_environment/cmake/openjpeg.cmake @@ -38,6 +38,19 @@ ExternalProject_Add(external_openjpeg INSTALL_DIR ${LIBDIR}/openjpeg ) +#on windows ffmpeg wants a mingw build, while oiio needs a msvc build +if (MSVC) + set(OPENJPEG_EXTRA_ARGS ${DEFAULT_CMAKE_FLAGS}) +ExternalProject_Add(external_openjpeg_msvc + URL ${OPENJPEG_URI} + DOWNLOAD_DIR ${DOWNLOAD_DIR} + URL_HASH SHA256=${OPENJPEG_HASH} + PREFIX ${BUILD_DIR}/openjpeg_msvc + CMAKE_ARGS ${OPENJPEG_EXTRA_ARGS} -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openjpeg_msvc -DBUILD_SHARED_LIBS=Off -DBUILD_THIRDPARTY=OFF + INSTALL_DIR ${LIBDIR}/openjpeg_msvc +) +endif() + set(OPENJPEG_LIBRARY libopenjpeg${LIBEXT}) if(MSVC) set_target_properties(external_openjpeg PROPERTIES FOLDER Mingw) |