Commit 6cdefeda authored by Gert Wollny's avatar Gert Wollny

Add cmake patch to find latest dcmtk

parent 891addb2
......@@ -2,11 +2,9 @@ Description: Fix the version of the shared library
Author: Sebastien Jodogne <s.jodogne@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
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