Commit dacfa3b5 authored by Sebastien Jodogne's avatar Sebastien Jodogne

moving patches done directly in the source code, to debian/patches

parent e4b38897
......@@ -266,7 +266,6 @@ else()
-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
......@@ -301,8 +300,6 @@ if (NOT DCMTK_USE_EMBEDDED_DICTIONARIES)
if (DCMTK_DICTIONARY_DIR STREQUAL "")
find_path(DCMTK_DICTIONARY_DIR_AUTO dicom.dic
/usr/share/dcmtk
/usr/share/libdcmtk12
/usr/share/libdcmtk11
/usr/share/libdcmtk1
/usr/share/libdcmtk2
/usr/share/libdcmtk3
......
Description: Fix finding and compiling against dcmtk-201702028
Description: Fix finding and compiling against dcmtk 3.6.2
Author: Gert Wollny <gewo@debian.org>
--- a/Resources/Orthanc/Resources/CMake/DcmtkConfiguration.cmake
+++ b/Resources/Orthanc/Resources/CMake/DcmtkConfiguration.cmake
......@@ -10,10 +10,11 @@ Author: Gert Wollny <gewo@debian.org>
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 @@
@@ -300,6 +301,8 @@
if (DCMTK_DICTIONARY_DIR STREQUAL "")
find_path(DCMTK_DICTIONARY_DIR_AUTO dicom.dic
/usr/share/dcmtk
+ /usr/share/libdcmtk12
+ /usr/share/libdcmtk11
/usr/share/libdcmtk1
/usr/share/libdcmtk2
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment