From 96ed3f17acdc60ccea40f7dd3b04f65ea5912140 Mon Sep 17 00:00:00 2001 From: J-Donald Tournier Date: Wed, 19 Jun 2024 12:06:54 +0100 Subject: [PATCH] remove TIFF from build system following removal from code --- .github/workflows/checks.yml | 1 - core/CMakeLists.txt | 13 +------------ packaging/mingw/PKGBUILD | 2 -- packaging/package-linux-tarball.sh | 3 +-- 4 files changed, 2 insertions(+), 17 deletions(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 4a4487d3ce..89f85fafcd 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -211,7 +211,6 @@ jobs: ${{env.MINGW_PACKAGE_PREFIX}}-eigen3 ${{env.MINGW_PACKAGE_PREFIX}}-fftw ${{env.MINGW_PACKAGE_PREFIX}}-gcc - ${{env.MINGW_PACKAGE_PREFIX}}-libtiff ${{env.MINGW_PACKAGE_PREFIX}}-ninja ${{env.MINGW_PACKAGE_PREFIX}}-pkg-config ${{env.MINGW_PACKAGE_PREFIX}}-qt6-base diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index 395c089319..7cc54e9388 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -8,17 +8,13 @@ find_package(FFTW REQUIRED) find_package(Git QUIET) find_package(Threads REQUIRED) find_package(PNG QUIET) -find_package(TIFF QUIET) -# The find modules for Eigen3, PNG and TIFF don't log the location +# The find modules for Eigen3, and PNG don't log the location # of the libraries, so we do it manually here message(STATUS "Found Eigen3: ${EIGEN3_INCLUDE_DIR}") if(PNG_FOUND) message(STATUS "Found PNG: ${PNG_LIBRARIES}") endif() -if(TIFF_FOUND) - message(STATUS "Found TIFF: ${TIFF_LIBRARIES}") -endif() add_library(mrtrix-core SHARED ${CORE_SRCS}) add_library(mrtrix::core ALIAS mrtrix-core) @@ -86,13 +82,6 @@ else() message(WARNING "libpng not found, disabling PNG support") endif() -if(TIFF_FOUND) - target_compile_definitions(mrtrix-core PUBLIC MRTRIX_TIFF_SUPPORT) - target_link_libraries(mrtrix-core PUBLIC TIFF::TIFF) -else() - message(WARNING "libtiff not found, disabling TIFF support") -endif() - target_link_libraries(mrtrix-core PUBLIC Eigen3::Eigen ZLIB::ZLIB diff --git a/packaging/mingw/PKGBUILD b/packaging/mingw/PKGBUILD index d1c8ddc43a..0753f7cbc5 100644 --- a/packaging/mingw/PKGBUILD +++ b/packaging/mingw/PKGBUILD @@ -10,7 +10,6 @@ pkgdesc="Tools for the analysis of diffusion MRI data (mingw-w64)" depends=("python" "${MINGW_PACKAGE_PREFIX}-qt6-svg" "${MINGW_PACKAGE_PREFIX}-fftw" - "${MINGW_PACKAGE_PREFIX}-libtiff" "${MINGW_PACKAGE_PREFIX}-zlib") makedepends=("git" "python" @@ -22,7 +21,6 @@ makedepends=("git" "${MINGW_PACKAGE_PREFIX}-ninja" "${MINGW_PACKAGE_PREFIX}-fftw" "${MINGW_PACKAGE_PREFIX}-gcc" - "${MINGW_PACKAGE_PREFIX}-libtiff" "${MINGW_PACKAGE_PREFIX}-qt6-svg" "${MINGW_PACKAGE_PREFIX}-qt6-base" "${MINGW_PACKAGE_PREFIX}-zlib") diff --git a/packaging/package-linux-tarball.sh b/packaging/package-linux-tarball.sh index cc7f3cea22..66600015e2 100755 --- a/packaging/package-linux-tarball.sh +++ b/packaging/package-linux-tarball.sh @@ -43,7 +43,6 @@ sudo apt install cmake \ libeigen3-dev \ zlib1g-dev \ libfftw3-dev \ - libtiff5-dev \ libpng-dev if ! command -v clang++-17 &> /dev/null @@ -88,4 +87,4 @@ rm -rf appdir/usr/translations # Remove translations since we don't need them cp $source_dir/install_mime_types.sh appdir/usr cp $source_dir/set_path appdir/usr tar -czf mrtrix.tar.gz -C appdir/usr . -cp mrtrix.tar.gz $running_dir \ No newline at end of file +cp mrtrix.tar.gz $running_dir