"platforms/opencl/vscode:/vscode.git/clone" did not exist on "b69f0c15531d7d697264fcf36dc22cae626bccde"
Unverified Commit baac8444 authored by Matthew Brett's avatar Matthew Brett Committed by GitHub
Browse files

Merge pull request #48 from radarhere/openjpeg_directory_prefix

Changed openjpeg directory prefix for versions newer than 2.1.0
parents f4950e78 44975c29
...@@ -148,11 +148,13 @@ function build_openjpeg { ...@@ -148,11 +148,13 @@ function build_openjpeg {
build_lcms2 build_lcms2
local cmake=$(get_cmake) local cmake=$(get_cmake)
local archive_prefix="v" local archive_prefix="v"
local directory_prefix="openjpeg-"
if [ $(lex_ver $OPENJPEG_VERSION) -lt $(lex_ver 2.1.1) ]; then if [ $(lex_ver $OPENJPEG_VERSION) -lt $(lex_ver 2.1.1) ]; then
archive_prefix="version." archive_prefix="version."
directory_prefix="openjpeg-version."
fi fi
fetch_unpack https://github.com/uclouvain/openjpeg/archive/${archive_prefix}${OPENJPEG_VERSION}.tar.gz fetch_unpack https://github.com/uclouvain/openjpeg/archive/${archive_prefix}${OPENJPEG_VERSION}.tar.gz
(cd openjpeg-version.${OPENJPEG_VERSION} \ (cd ${directory_prefix}${OPENJPEG_VERSION} \
&& $cmake -DCMAKE_INSTALL_PREFIX=$BUILD_PREFIX . \ && $cmake -DCMAKE_INSTALL_PREFIX=$BUILD_PREFIX . \
&& make install) && make install)
touch openjpeg-stamp touch openjpeg-stamp
......
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