[med-svn] [Git][med-team/fast][master] 2 commits: Use libopenslide-dev instead

[Shayan Doust]

Shayan Doust pushed to branch master at Debian Med / fast


Commits:
aafb3e8f by Shayan Doust at 2019-07-26T22:25:19Z
Use libopenslide-dev instead

- - - - -
49e9f339 by Shayan Doust at 2019-07-26T22:28:28Z
Prevent cmake from installing non-existant zlib asset

- - - - -


4 changed files:

- debian/control
- debian/patches/series
- + debian/patches/use_system_openslide.cmake
- debian/patches/use_system_zlib.patch


Changes:

=====================================
debian/control
=====================================
@@ -12,7 +12,8 @@ Build-Depends: debhelper-compat (= 12),
 	       zlib1g-dev,
 	       libeigen3-dev,
 	       opencl-c-headers,
-	       ocl-icd-opencl-dev
+	       ocl-icd-opencl-dev,
+	       libopenslide-dev
 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/series
=====================================
@@ -1,3 +1,4 @@
+use_system_openslide.cmake
 use_system_eigen.patch
 use_system_zlib.patch
 disable_tests.patch


=====================================
debian/patches/use_system_openslide.cmake
=====================================
@@ -0,0 +1,48 @@
+Index: fast/CMakeLists.txt
+===================================================================
+--- fast.orig/CMakeLists.txt	2019-07-26 22:17:23.542012300 +0100
++++ fast/CMakeLists.txt	2019-07-26 22:24:50.269644742 +0100
+@@ -162,7 +162,7 @@
+ generate_export_header(FAST EXPORT_FILE_NAME FASTExport.hpp)
+ 
+ include(cmake/OpenMP.cmake)
+-
++target_link_libraries(FAST PUBLIC openslide)
+ ## Link everything
+ message("-- LIBS: ${LIBRARIES} ${FAST_SYSTEM_LIBRARIES}")
+ target_link_libraries(FAST PUBLIC ${LIBRARIES} ${FAST_SYSTEM_LIBRARIES})
+Index: fast/cmake/ExternalOpenSlide.cmake
+===================================================================
+--- fast.orig/cmake/ExternalOpenSlide.cmake	2019-07-26 22:17:23.542012300 +0100
++++ fast/cmake/ExternalOpenSlide.cmake	2019-07-26 22:22:53.392694417 +0100
+@@ -1,17 +1,17 @@
+ # Download and set up OpenSlide
+ 
+-include(cmake/Externals.cmake)
++#include(cmake/Externals.cmake)
+ 
+-if(WIN32)
++#if(WIN32)
+ 
+-ExternalProject_Add(openslide
+-        PREFIX ${FAST_EXTERNAL_BUILD_DIR}/openslide
+-        BINARY_DIR ${FAST_EXTERNAL_BUILD_DIR}/openslide
+-        URL "https://github.com/openslide/openslide-winbuild/releases/download/v20171122/openslide-win64-20171122.zip"
+-        CONFIGURE_COMMAND ${CMAKE_COMMAND} -E copy_directory ${FAST_EXTERNAL_BUILD_DIR}/openslide/src/openslide/ ${FAST_EXTERNAL_INSTALL_DIR}
+-        BUILD_COMMAND ""
+-        INSTALL_COMMAND ""
+-)
++#ExternalProject_Add(openslide
++#       PREFIX ${FAST_EXTERNAL_BUILD_DIR}/openslide
++#       BINARY_DIR ${FAST_EXTERNAL_BUILD_DIR}/openslide
++#       URL "https://github.com/openslide/openslide-winbuild/releases/download/v20171122/openslide-win64-20171122.zip"
++#       CONFIGURE_COMMAND ${CMAKE_COMMAND} -E copy_directory ${FAST_EXTERNAL_BUILD_DIR}/openslide/src/openslide/ ${FAST_EXTERNAL_INSTALL_DIR}
++#       BUILD_COMMAND ""
++#       INSTALL_COMMAND ""
++#)
+ 
+-list(APPEND FAST_EXTERNAL_DEPENDENCIES openslide)
+-endif()
+\ No newline at end of file
++#list(APPEND FAST_EXTERNAL_DEPENDENCIES openslide)
++#endif()


=====================================
debian/patches/use_system_zlib.patch
=====================================
@@ -1,7 +1,7 @@
 Index: fast/cmake/ExternalZlib.cmake
 ===================================================================
---- fast.orig/cmake/ExternalZlib.cmake	2019-07-26 09:34:34.497861993 +0100
-+++ fast/cmake/ExternalZlib.cmake	2019-07-26 09:34:34.493861960 +0100
+--- fast.orig/cmake/ExternalZlib.cmake	2019-07-26 23:27:52.236396403 +0100
++++ fast/cmake/ExternalZlib.cmake	2019-07-26 23:27:52.232396370 +0100
 @@ -1,24 +1,24 @@
  # Download and set up zlib
  
@@ -51,8 +51,8 @@ Index: fast/cmake/ExternalZlib.cmake
 +#list(APPEND FAST_EXTERNAL_DEPENDENCIES zlib)
 Index: fast/CMakeLists.txt
 ===================================================================
---- fast.orig/CMakeLists.txt	2019-07-26 09:34:34.497861993 +0100
-+++ fast/CMakeLists.txt	2019-07-26 09:34:59.850068126 +0100
+--- fast.orig/CMakeLists.txt	2019-07-26 23:27:52.236396403 +0100
++++ fast/CMakeLists.txt	2019-07-26 23:27:52.232396370 +0100
 @@ -166,6 +166,7 @@
  ## Link everything
  message("-- LIBS: ${LIBRARIES} ${FAST_SYSTEM_LIBRARIES}")
@@ -61,3 +61,20 @@ Index: fast/CMakeLists.txt
  if(FAST_MODULE_Visualization AND FAST_BUILD_QT5)
      qt5_use_modules(FAST Widgets OpenGL) # Add Qt 5 modules
  endif()
+Index: fast/cmake/InstallFAST.cmake
+===================================================================
+--- fast.orig/cmake/InstallFAST.cmake	2019-07-26 23:27:46.208347389 +0100
++++ fast/cmake/InstallFAST.cmake	2019-07-26 23:28:17.744603807 +0100
+@@ -190,9 +190,9 @@
+ #		DESTINATION fast/licenses/eigen/
+ #)
+ # zlib
+-install(FILES ${FAST_EXTERNAL_BUILD_DIR}/zlib/src/zlib/README
+-		DESTINATION fast/licenses/zlib/
+-)
++#install(FILES ${FAST_EXTERNAL_BUILD_DIR}/zlib/src/zlib/README
++#		DESTINATION fast/licenses/zlib/
++#)
+ # OpenIGTLink
+ install(FILES ${FAST_EXTERNAL_BUILD_DIR}/OpenIGTLink/src/OpenIGTLink/LICENSE.txt
+ 		DESTINATION fast/licenses/OpenIGTLink/



View it on GitLab: https://salsa.debian.org/med-team/fast/compare/efa24cff7df539a0d5aec24d283a0862dca3a722...49e9f3399f361523df07275d096dbec45fdb5f06

-- 
View it on GitLab: https://salsa.debian.org/med-team/fast/compare/efa24cff7df539a0d5aec24d283a0862dca3a722...49e9f3399f361523df07275d096dbec45fdb5f06
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/20190807/1f40144f/attachment-0001.html>