diff --git a/root.sh b/root.sh index 787a165249..49bb316351 100644 --- a/root.sh +++ b/root.sh @@ -89,6 +89,8 @@ case $ARCHITECTURE in [[ ! $GSL_ROOT ]] && GSL_ROOT=$(brew --prefix gsl) [[ ! $OPENSSL_ROOT ]] && SYS_OPENSSL_ROOT=$(brew --prefix openssl@3) [[ ! $LIBPNG_ROOT ]] && LIBPNG_ROOT=$(brew --prefix libpng) + [[ ! $LZMA_ROOT ]] && LZMA_ROOT=$(brew --prefix xz) + EXTRA_CMAKE_CXX_FLAGS="-Wno-vla-extension" ;; esac @@ -141,6 +143,7 @@ CMAKE_GENERATOR=${CMAKE_GENERATOR:-Ninja} cmake $SOURCEDIR \ ${CMAKE_GENERATOR:+-G "$CMAKE_GENERATOR"} \ -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE \ + ${EXTRA_CMAKE_CXX_FLAGS:+-DCMAKE_CXX_FLAGS="${EXTRA_CMAKE_CXX_FLAGS}"} \ -DCMAKE_INSTALL_PREFIX=$INSTALLROOT \ -Dalien=OFF \ ${CMAKE_CXX_STANDARD:+-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}} \ @@ -170,6 +173,8 @@ cmake $SOURCEDIR ${LIBPNG_ROOT:+-DPNG_LIBRARY="${LIBPNG_ROOT}/lib/libpng.${SONAME}"} \ ${PROTOBUF_REVISION:+-DProtobuf_DIR=${PROTOBUF_ROOT}} \ ${ZLIB_ROOT:+-DZLIB_ROOT=${ZLIB_ROOT}} \ + ${LZMA_ROOT:+-DLIBLZMA_INCLUDE_DIR=${LZMA_ROOT}/include} \ + ${LZMA_ROOT:+-DLIBLZMA_LIBRARY=${LZMA_ROOT}/lib/liblzma.${SONAME}} \ ${FFTW3_ROOT:+-DFFTW_DIR=${FFTW3_ROOT}} \ ${NLOHMANN_JSON_ROOT:+nlohmann_json_DIR=${NLOHMANN_JSON_ROOT}} \ -Dfftw3=ON \ @@ -188,6 +193,7 @@ cmake $SOURCEDIR -Dgviz=OFF \ -Dbuiltin_davix=OFF \ -Dbuiltin_fftw3=OFF \ + -Dbuiltin_lzma=OFF \ -Dtmva-sofie=ON \ -Dtmva-gpu=OFF \ -Ddavix=OFF \