Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

remove TIFF from build system following removal from code #2928

Merged
merged 1 commit into from
Jun 19, 2024
Merged

remove TIFF from build system following removal from code #2928

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/checks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 1 addition & 12 deletions core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions packaging/mingw/PKGBUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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")
Expand Down
3 changes: 1 addition & 2 deletions packaging/package-linux-tarball.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
cp mrtrix.tar.gz $running_dir
Loading