Commit 589a6701 authored by Andrew Murray's avatar Andrew Murray
Browse files

Deprecated get_cmake, renaming it to get_modern_cmake

parent a905f412
...@@ -152,7 +152,7 @@ function build_tiff { ...@@ -152,7 +152,7 @@ function build_tiff {
build_simple tiff $TIFF_VERSION https://download.osgeo.org/libtiff build_simple tiff $TIFF_VERSION https://download.osgeo.org/libtiff
} }
function get_cmake { function get_modern_cmake {
local cmake=cmake local cmake=cmake
if [ -n "$IS_OSX" ]; then if [ -n "$IS_OSX" ]; then
brew install cmake > /dev/null brew install cmake > /dev/null
...@@ -165,13 +165,18 @@ function get_cmake { ...@@ -165,13 +165,18 @@ function get_cmake {
echo $cmake echo $cmake
} }
function get_cmake {
>&2 echo "get_cmake has been deprecated. Please use get_modern_cmake instead."
get_modern_cmake
}
function build_openjpeg { function build_openjpeg {
if [ -e openjpeg-stamp ]; then return; fi if [ -e openjpeg-stamp ]; then return; fi
build_zlib build_zlib
build_libpng build_libpng
build_tiff build_tiff
build_lcms2 build_lcms2
local cmake=$(get_cmake) local cmake=$(get_modern_cmake)
local archive_prefix="v" local archive_prefix="v"
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."
...@@ -254,7 +259,7 @@ function build_libaec { ...@@ -254,7 +259,7 @@ function build_libaec {
function build_blosc { function build_blosc {
if [ -e blosc-stamp ]; then return; fi if [ -e blosc-stamp ]; then return; fi
local cmake=$(get_cmake) local cmake=$(get_modern_cmake)
fetch_unpack https://github.com/Blosc/c-blosc/archive/v${BLOSC_VERSION}.tar.gz fetch_unpack https://github.com/Blosc/c-blosc/archive/v${BLOSC_VERSION}.tar.gz
(cd c-blosc-${BLOSC_VERSION} \ (cd c-blosc-${BLOSC_VERSION} \
&& $cmake -DCMAKE_INSTALL_PREFIX=$BUILD_PREFIX . \ && $cmake -DCMAKE_INSTALL_PREFIX=$BUILD_PREFIX . \
......
...@@ -56,7 +56,7 @@ if [ -z "$IS_OSX" ]; then ...@@ -56,7 +56,7 @@ if [ -z "$IS_OSX" ]; then
fi fi
suppress build_new_zlib suppress build_new_zlib
suppress build_hdf5 suppress build_hdf5
suppress get_cmake suppress get_modern_cmake
[ ${MB_PYTHON_VERSION+x} ] || ingest "\$MB_PYTHON_VERSION is not set" [ ${MB_PYTHON_VERSION+x} ] || ingest "\$MB_PYTHON_VERSION is not set"
[ "$MB_PYTHON_VERSION" == "$PYTHON_VERSION" ] || ingest "\$MB_PYTHON_VERSION must be equal to \$PYTHON_VERSION" [ "$MB_PYTHON_VERSION" == "$PYTHON_VERSION" ] || ingest "\$MB_PYTHON_VERSION must be equal to \$PYTHON_VERSION"
......
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