[med-svn] [orthanc-wsi] 01/03: Add cmake patch to find latest dcmtk

[Gert Wollny]

This is an automated email from the git hooks/post-receive script.

gewo pushed a commit to branch master
in repository orthanc-wsi.

commit 6cdefeda2af093ce48b6dabed014f624eed5655e
Author: Gert Wollny <gewo at debian.org>
Date:   Sun Jun 25 07:47:12 2017 +0000

    Add cmake patch to find latest dcmtk
---
 debian/patches/cmake | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/debian/patches/cmake b/debian/patches/cmake
index 78f12e7..d811c36 100644
--- a/debian/patches/cmake
+++ b/debian/patches/cmake
@@ -2,11 +2,9 @@ Description: Fix the version of the shared library
 Author: Sebastien Jodogne <s.jodogne at gmail.com>
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: OrthancWSI-0.4/ViewerPlugin/CMakeLists.txt
-===================================================================
---- OrthancWSI-0.4.orig/ViewerPlugin/CMakeLists.txt
-+++ OrthancWSI-0.4/ViewerPlugin/CMakeLists.txt
-@@ -234,9 +234,10 @@ add_library(OrthancWSI SHARED
+--- a/ViewerPlugin/CMakeLists.txt
++++ b/ViewerPlugin/CMakeLists.txt
+@@ -234,9 +234,10 @@
    )
  
  message("Setting the version of the library to ${ORTHANC_WSI_VERSION}")
@@ -20,3 +18,21 @@ Index: OrthancWSI-0.4/ViewerPlugin/CMakeLists.txt
  
  install(
    TARGETS OrthancWSI
+--- a/Resources/Orthanc/Resources/CMake/DcmtkConfiguration.cmake
++++ b/Resources/Orthanc/Resources/CMake/DcmtkConfiguration.cmake
+@@ -266,6 +266,7 @@
+     -DHAVE_CONFIG_H=1
+     )
+ 
++  SET(DCMTK_config_INCLUDE_DIR ${DCMTK_INCLUDE_DIR}/dcmtk/config)
+   if (EXISTS "${DCMTK_config_INCLUDE_DIR}/cfunix.h")
+     set(DCMTK_CONFIGURATION_FILE "${DCMTK_config_INCLUDE_DIR}/cfunix.h")
+   elseif (EXISTS "${DCMTK_config_INCLUDE_DIR}/osconfig.h")  # This is for Arch Linux
+@@ -300,6 +301,7 @@
+   if (DCMTK_DICTIONARY_DIR STREQUAL "")
+     find_path(DCMTK_DICTIONARY_DIR_AUTO dicom.dic
+       /usr/share/dcmtk
++      /usr/share/libdcmtk11
+       /usr/share/libdcmtk1
+       /usr/share/libdcmtk2
+       /usr/share/libdcmtk3

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/orthanc-wsi.git