[med-svn] [Git][med-team/fast][master] 2 commits: FASTExport.hpp was never installed in the right location

[Shayan Doust]

Shayan Doust pushed to branch master at Debian Med / fast


Commits:
8d54d9d8 by Shayan Doust at 2019-08-12T00:38:07Z
FASTExport.hpp was never installed in the right location
Rectify this. This should be in /usr/include and not /usr/include/FAST

- - - - -
99fc6181 by Shayan Doust at 2019-08-12T00:42:17Z
Add install dependencies
This list may still be incomplete as I am lacking test suite to test

- - - - -


3 changed files:

- debian/control
- − debian/patches/fix_test.patch
- debian/rules


Changes:

=====================================
debian/control
=====================================
@@ -30,7 +30,11 @@ Homepage: https://github.com/smistad/FAST
 Package: fast
 Architecture: any
 Depends: ${shlibs:Depends},
-         ${misc:Depends}
+         ${misc:Depends},
+	 opencl-c-headers,
+	 ocl-icd-opencl-dev,
+	 libeigen3-dev,
+	 qtbase5-dev
 Description: framework for Heterogeneous Medical Image Computing
  An open-source cross-platform framework with the main goal of making it
  easier to do processing and visualization of medical images on


=====================================
debian/patches/fix_test.patch deleted
=====================================
@@ -1,39 +0,0 @@
-Description: hopefully temporary override to compile for tests
- This patch disables the test suite for NeuralNetwork as this is problematic. This needs checking.
-Author: Shayan Doust <hello at shayandoust.me>
-Last-Update: 2019-08-11
----
-
-Index: fast/source/FAST/Algorithms/NeuralNetwork/CMakeLists.txt
-===================================================================
---- fast.orig/source/FAST/Algorithms/NeuralNetwork/CMakeLists.txt	2019-08-11 12:39:37.245215709 +0100
-+++ fast/source/FAST/Algorithms/NeuralNetwork/CMakeLists.txt	2019-08-11 12:39:37.241215674 +0100
-@@ -16,17 +16,17 @@
- fast_add_process_object(ClassificationToText ImageClassificationNetwork.hpp)
- fast_add_process_object(SegmentationNetwork SegmentationNetwork.hpp)
- fast_add_process_object(ImageToImageNetwork ImageToImageNetwork.hpp)
--if(FAST_MODULE_Visualization)
--    fast_add_test_sources(
--        Tests.cpp
--        ImageClassifierTests.cpp
--        VolumeTests.cpp
--    )
--    if(FAST_MODULE_WholeSlideImaging)
--        fast_add_test_sources(WSITests.cpp)
--        fast_add_example(measureNeuralNetworkPerformance measureNeuralNetworkPerformance.cpp)
--    endif()
--endif()
-+#if(FAST_MODULE_Visualization)
-+#    fast_add_test_sources(
-+#        Tests.cpp
-+#        ImageClassifierTests.cpp
-+#        VolumeTests.cpp
-+#    )
-+#    if(FAST_MODULE_WholeSlideImaging)
-+#        fast_add_test_sources(WSITests.cpp)
-+#        fast_add_example(measureNeuralNetworkPerformance measureNeuralNetworkPerformance.cpp)
-+#    endif()
-+#endif()
- #fast_add_example(timingNetwork timingNetwork.cpp)
- #fast_add_example(imageClassification imageClassification.cpp)
- #fast_add_example(leftVentricleSegmentation leftVentricleSegmentation.cpp)


=====================================
debian/rules
=====================================
@@ -15,7 +15,12 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 override_dh_install:
 	dh_install
 	find debian/fast -empty -type d -delete
-	mkdir debian/fast/usr/lib debian/fast/usr/lib/$(DEB_HOST_MULTIARCH) debian/fast/usr/lib/fast
+	mkdir debian/fast/usr/lib debian/fast/usr/lib/$(DEB_HOST_MULTIARCH) \
+		debian/fast/usr/lib/fast \
+		debian/fast/usr/include \
+		debian/fast/usr/include/FAST
 	mv debian/fast/usr/fast/lib/* debian/fast/usr/lib/$(DEB_HOST_MULTIARCH)
 	mv debian/fast/usr/fast/kernels debian/fast/usr/lib/fast
+	mv debian/fast/usr/fast/include/FAST/* debian/fast/usr/include/FAST
+	mv debian/fast/usr/fast/include/FASTExport.hpp debian/fast/usr/include
 	rm -r debian/fast/usr/fast



View it on GitLab: https://salsa.debian.org/med-team/fast/compare/47deac3cc770e195793a065dcf36a0d07c0a8d22...99fc6181161b6f2d3000d482c5139000d1583099

-- 
View it on GitLab: https://salsa.debian.org/med-team/fast/compare/47deac3cc770e195793a065dcf36a0d07c0a8d22...99fc6181161b6f2d3000d482c5139000d1583099
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20190812/69e46f27/attachment-0001.html>