[med-svn] [Git][med-team/fast][master] 3 commits: Now use system qt5 libraries

[Shayan Doust]

Shayan Doust pushed to branch master at Debian Med / fast


Commits:
42b7cf7f by Shayan Doust at 2019-08-09T05:33:30Z
Now use system qt5 libraries

- - - - -
f0bffb3a by Shayan Doust at 2019-08-09T05:34:30Z
Libraries all seem to be sorted so we get rid of git as a build dependency

- - - - -
51bd5723 by Shayan Doust at 2019-08-09T07:35:58Z
Add more build dependencies

- - - - -


3 changed files:

- debian/control
- debian/patches/remove_unneeded_installs.patch
- debian/patches/use_system_libs.patch


Changes:

=====================================
debian/control
=====================================
@@ -16,7 +16,10 @@ Build-Depends: debhelper-compat (= 12),
                libopenslide-dev,
 	       libopenigtlink-dev,
 	       libdcmtk-dev,
-	       git
+	       libqt5opengl5-dev,
+	       libqt5serialport5-dev,
+	       qtbase5-dev,
+	       libqt5core5a 
 Standards-Version: 4.3.0
 Vcs-Browser: https://salsa.debian.org/med-team/fast
 Vcs-Git: https://salsa.debian.org/med-team/fast.git


=====================================
debian/patches/remove_unneeded_installs.patch
=====================================
@@ -6,8 +6,21 @@ Last-Update: 2019-08-08
 
 Index: fast/cmake/InstallFAST.cmake
 ===================================================================
---- fast.orig/cmake/InstallFAST.cmake	2019-08-08 15:56:39.374462089 +0100
-+++ fast/cmake/InstallFAST.cmake	2019-08-08 15:56:39.374462089 +0100
+--- fast.orig/cmake/InstallFAST.cmake	2019-08-09 06:16:51.813007429 +0100
++++ fast/cmake/InstallFAST.cmake	2019-08-09 06:20:53.938997663 +0100
+@@ -47,9 +47,9 @@
+ endif()
+ 
+ # Install Qt plugins
+-install(DIRECTORY ${PROJECT_BINARY_DIR}/plugins/
+-    DESTINATION fast/QtPlugins/
+-)
++#install(DIRECTORY ${PROJECT_BINARY_DIR}/plugins/
++#    DESTINATION fast/QtPlugins/
++#)
+ 
+ # Install qt.conf
+ install(FILES ${PROJECT_SOURCE_DIR}/cmake/InstallFiles/qt.conf
 @@ -185,18 +185,18 @@
  )
  


=====================================
debian/patches/use_system_libs.patch
=====================================
@@ -5,13 +5,32 @@ Author: Shayan Doust <hello at shayandoust.me>
 
 Index: fast/CMakeLists.txt
 ===================================================================
---- fast.orig/CMakeLists.txt	2019-08-09 04:17:42.918244664 +0100
-+++ fast/CMakeLists.txt	2019-08-09 04:17:57.242362402 +0100
-@@ -170,6 +170,17 @@
+--- fast.orig/CMakeLists.txt	2019-08-09 05:56:37.211023586 +0100
++++ fast/CMakeLists.txt	2019-08-09 05:57:42.647561464 +0100
+@@ -34,7 +34,7 @@
+ option(FAST_MODULE_WholeSlideImaging "Build whole slide imaging module" OFF)
+ option(FAST_MODULE_Clarius "Build clarius ultrasound module" OFF)
+ option(FAST_CONTINUOUS_INTEGRATION "Used for continuous integration tests" OFF)
+-option(FAST_BUILD_QT5 "Download and build Qt 5.8. Turn this OFF if you want to use pre-built binaries you already have on your machine." ON)
++option(FAST_BUILD_QT5 "Download and build Qt 5.8. Turn this OFF if you want to use pre-built binaries you already have on your machine." OFF)
+ 
+ # Python version
+ set(FAST_Python_Version "" CACHE STRING "Specify which Python version to build python wrappers with. E.g. 2 or 3")
+@@ -157,7 +157,7 @@
+ 
+ #### Create FAST library and executables
+ add_library(FAST SHARED ${FAST_SOURCE_FILES} ${HEADERS_MOC})
+-add_dependencies(FAST ${FAST_EXTERNAL_DEPENDENCIES})
++#add_dependencies(FAST ${FAST_EXTERNAL_DEPENDENCIES})
+ include(GenerateExportHeader)
+ generate_export_header(FAST EXPORT_FILE_NAME FASTExport.hpp)
+ 
+@@ -170,6 +170,18 @@
      qt5_use_modules(FAST Widgets OpenGL) # Add Qt 5 modules
  endif()
  
 +find_package(Eigen3 REQUIRED)
++find_package(Qt5 REQUIRED SerialPort)
 +
 +target_link_libraries(FAST PUBLIC Eigen3::Eigen)
 +target_link_libraries(FAST PUBLIC openslide)



View it on GitLab: https://salsa.debian.org/med-team/fast/compare/61aac01069637c02b10a550339d39199b5fb9404...51bd5723f5b76735b7f2f9f7cfff128503cd7ad7

-- 
View it on GitLab: https://salsa.debian.org/med-team/fast/compare/61aac01069637c02b10a550339d39199b5fb9404...51bd5723f5b76735b7f2f9f7cfff128503cd7ad7
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/20190809/4f03625c/attachment-0001.html>