[med-svn] [orthanc] 01/04: fix bug #818512

[Sebastien Jodogne]

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

jodogne-guest pushed a commit to branch master
in repository orthanc.

commit 99f77dccb144c029899feabdedddfdaa6a5250fe
Author: jodogne-guest <s.jodogne at gmail.com>
Date:   Mon Apr 4 14:14:30 2016 +0200

    fix bug #818512
---
 debian/patches/cmake-dcmtk | 30 ++++++++++++++++++++++++++++++
 debian/patches/series      |  1 +
 2 files changed, 31 insertions(+)

diff --git a/debian/patches/cmake-dcmtk b/debian/patches/cmake-dcmtk
new file mode 100644
index 0000000..92de30d
--- /dev/null
+++ b/debian/patches/cmake-dcmtk
@@ -0,0 +1,30 @@
+Description: Fix bug #818512 ("FTBFS: Please install libdcmtk*-dev")
+Author: Sebastien Jodogne <s.jodogne at gmail.com>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: Orthanc-1.0.0/Resources/CMake/DcmtkConfiguration.cmake
+===================================================================
+--- Orthanc-1.0.0.orig/Resources/CMake/DcmtkConfiguration.cmake	2015-12-15 17:49:02.000000000 +0100
++++ Orthanc-1.0.0/Resources/CMake/DcmtkConfiguration.cmake	2016-04-04 14:12:12.761016221 +0200
+@@ -180,16 +180,16 @@
+   include(FindDCMTK)
+   list(APPEND DCMTK_LIBRARIES "${tmp}")
+ 
+-  include_directories(${DCMTK_INCLUDE_DIR})
++  include_directories(${DCMTK_INCLUDE_DIRS})
+ 
+   add_definitions(
+     -DHAVE_CONFIG_H=1
+     )
+ 
+-  if (EXISTS "${DCMTK_DIR}/config/cfunix.h")
+-    set(DCMTK_CONFIGURATION_FILE "${DCMTK_DIR}/config/cfunix.h")
+-  elseif (EXISTS "${DCMTK_DIR}/config/osconfig.h")  # This is for Arch Linux
+-    set(DCMTK_CONFIGURATION_FILE "${DCMTK_DIR}/config/osconfig.h")
++  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
++    set(DCMTK_CONFIGURATION_FILE "${DCMTK_config_INCLUDE_DIR}/osconfig.h")
+   else()
+     message(FATAL_ERROR "Please install libdcmtk*-dev")
+   endif()
diff --git a/debian/patches/series b/debian/patches/series
index 8b13789..a728c1c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+cmake-dcmtk
 

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