Commit accd842d authored by Matthew Brett's avatar Matthew Brett Committed by GitHub
Browse files

Merge pull request #47 from radarhere/openjpeg_archive_prefix

MRG: Changed openjpeg archive prefix for versions newer than 2.1.0
parents 08c0538f 83716631
...@@ -143,7 +143,11 @@ function build_openjpeg { ...@@ -143,7 +143,11 @@ function build_openjpeg {
build_tiff build_tiff
build_lcms2 build_lcms2
local cmake=$(get_cmake) local cmake=$(get_cmake)
fetch_unpack https://github.com/uclouvain/openjpeg/archive/version.${OPENJPEG_VERSION}.tar.gz local archive_prefix="v"
if [ $(lex_ver $OPENJPEG_VERSION) -lt $(lex_ver 2.1.1) ]; then
archive_prefix="version."
fi
fetch_unpack https://github.com/uclouvain/openjpeg/archive/${archive_prefix}${OPENJPEG_VERSION}.tar.gz
(cd openjpeg-version.${OPENJPEG_VERSION} \ (cd openjpeg-version.${OPENJPEG_VERSION} \
&& $cmake -DCMAKE_INSTALL_PREFIX=$BUILD_PREFIX . \ && $cmake -DCMAKE_INSTALL_PREFIX=$BUILD_PREFIX . \
&& make install) && make install)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment