Commit 8e43555b authored by Gert Wollny's avatar Gert Wollny

Correct cmake and dcmtk patch

parent 6cdefeda
......@@ -18,21 +18,3 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
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
Description: Fix finding and compiling against dcmtk-201702028
Author: Gert Wollny <gewo@debian.org>
--- 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
cmake
dcmtk-3.6.1~20170228.patch
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