Archived
1
0
Fork 0

gnu: insight-toolkit: Remove input labels and use gexps.

* gnu/packages/image-processing.scm (insight-toolkit)[arguments]: Use
gexps.
[inputs]: Remove labels.
(insight-toolkit-4)[arguments]: Use gexps.
This commit is contained in:
Ludovic Courtès 2023-07-18 13:26:50 +02:00 committed by Ludovic Courtès
parent b910dedff0
commit 437687b715
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5

View file

@ -1279,39 +1279,38 @@ libraries designed for computer vision research and implementation.")
(base32 "0bs63mk4q8jmx38f031jy5w5n9yy5ng9x8ijwinvjyvas8cichqi")))) (base32 "0bs63mk4q8jmx38f031jy5w5n9yy5ng9x8ijwinvjyvas8cichqi"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:tests? #f ; tests require network access and external data (list #:tests? #f ; tests require network access and external data
#:configure-flags #:configure-flags #~'("-DITK_USE_GPU=ON"
'("-DITK_USE_GPU=ON" "-DITK_USE_SYSTEM_LIBRARIES=ON"
"-DITK_USE_SYSTEM_LIBRARIES=ON" "-DITK_USE_SYSTEM_GOOGLETEST=ON"
"-DITK_USE_SYSTEM_GOOGLETEST=ON" "-DITK_BUILD_SHARED=ON"
"-DITK_BUILD_SHARED=ON" ;; This prevents "GTest::GTest" from being added to the ITK_LIBRARIES
;; This prevents "GTest::GTest" from being added to the ITK_LIBRARIES ;; variable in the installed CMake files. This is necessary as other
;; variable in the installed CMake files. This is necessary as other ;; packages using insight-toolkit could not be configured otherwise.
;; packages using insight-toolkit could not be configured otherwise. "-DGTEST_ROOT=gtest"
"-DGTEST_ROOT=gtest" "-DCMAKE_CXX_STANDARD=17")
"-DCMAKE_CXX_STANDARD=17")
#:phases #:phases #~(modify-phases %standard-phases
(modify-phases %standard-phases (add-after 'unpack 'do-not-tune
(add-after 'unpack 'do-not-tune (lambda _
(lambda _ (substitute* "CMake/ITKSetStandardCompilerFlags.cmake"
(substitute* "CMake/ITKSetStandardCompilerFlags.cmake" (("-mtune=native")
(("-mtune=native") ""))))))) "")))))))
(inputs (inputs
`(("eigen" ,eigen) (list eigen
("expat" ,expat) expat
("fftw" ,fftw) fftw
("fftwf" ,fftwf) fftwf
("hdf5" ,hdf5) hdf5
("libjpeg" ,libjpeg-turbo) libjpeg-turbo
("libpng" ,libpng) libpng
("libtiff" ,libtiff) libtiff
("mesa" ,mesa-opencl) mesa-opencl
("perl" ,perl) perl
("python" ,python) python
("tbb" ,tbb) tbb
("vxl" ,vxl-1) vxl-1
("zlib" ,zlib))) zlib))
(native-inputs (native-inputs
(list googletest pkg-config)) (list googletest pkg-config))
(home-page "https://github.com/InsightSoftwareConsortium/ITK/") (home-page "https://github.com/InsightSoftwareConsortium/ITK/")
@ -1338,13 +1337,12 @@ combine the information contained in both.")
(sha256 (sha256
(base32 "19cgfpd63gqrvc3m27m394gy2d7w79g5y6lvznb5qqr49lihbgns")))) (base32 "19cgfpd63gqrvc3m27m394gy2d7w79g5y6lvznb5qqr49lihbgns"))))
(arguments (arguments
`(#:tests? #f ; tests require network access and external data (list #:tests? #f ; tests require network access and external data
#:configure-flags #:configure-flags #~'("-DITKV3_COMPATIBILITY=ON" ; needed for itk-snap
'("-DITKV3_COMPATIBILITY=ON" ; needed for itk-snap "-DITK_USE_GPU=ON"
"-DITK_USE_GPU=ON" "-DITK_USE_SYSTEM_LIBRARIES=ON"
"-DITK_USE_SYSTEM_LIBRARIES=ON" "-DITK_USE_SYSTEM_GOOGLETEST=ON"
"-DITK_USE_SYSTEM_GOOGLETEST=ON" "-DITK_USE_SYSTEM_VXL=ON")))))
"-DITK_USE_SYSTEM_VXL=ON")))))
(define-public insight-toolkit-4.12 (define-public insight-toolkit-4.12
(package (inherit insight-toolkit-4) (package (inherit insight-toolkit-4)