[med-svn] [orthanc-wsi] 01/02: Update search path for dicomdict, Closes: #873024

[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 6778a9ad124cd6f6c3e33627d4d698724fc57c8a
Author: Gert Wollny <gewo at debian.org>
Date:   Wed Aug 23 20:54:36 2017 +0000

    Update search path for dicomdict, Closes: #873024
---
 Resources/Orthanc/OrthancServer/FromDcmtkBridge.cpp        | 2 +-
 Resources/Orthanc/Resources/CMake/DcmtkConfiguration.cmake | 3 +++
 ViewerPlugin/CMakeLists.txt                                | 7 ++++---
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Resources/Orthanc/OrthancServer/FromDcmtkBridge.cpp b/Resources/Orthanc/OrthancServer/FromDcmtkBridge.cpp
index 532d850..af9c0e4 100644
--- a/Resources/Orthanc/OrthancServer/FromDcmtkBridge.cpp
+++ b/Resources/Orthanc/OrthancServer/FromDcmtkBridge.cpp
@@ -1681,7 +1681,7 @@ namespace Orthanc
           throw OrthancException(ErrorCode_BadParameterType);
         }
 
-        DcmSequenceOfItems* sequence = new DcmSequenceOfItems(key, value.size());
+        DcmSequenceOfItems* sequence = new DcmSequenceOfItems(key);
         element.reset(sequence);
         
         for (Json::Value::ArrayIndex i = 0; i < value.size(); i++)
diff --git a/Resources/Orthanc/Resources/CMake/DcmtkConfiguration.cmake b/Resources/Orthanc/Resources/CMake/DcmtkConfiguration.cmake
index 8534a93..c6e2f3d 100644
--- a/Resources/Orthanc/Resources/CMake/DcmtkConfiguration.cmake
+++ b/Resources/Orthanc/Resources/CMake/DcmtkConfiguration.cmake
@@ -266,6 +266,7 @@ 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
@@ -300,6 +301,8 @@ 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
diff --git a/ViewerPlugin/CMakeLists.txt b/ViewerPlugin/CMakeLists.txt
index 2b0a7c0..95338b3 100644
--- a/ViewerPlugin/CMakeLists.txt
+++ b/ViewerPlugin/CMakeLists.txt
@@ -234,9 +234,10 @@ add_library(OrthancWSI SHARED
   )
 
 message("Setting the version of the library to ${ORTHANC_WSI_VERSION}")
-set_target_properties(OrthancWSI PROPERTIES 
-  VERSION ${ORTHANC_WSI_VERSION} 
-  SOVERSION ${ORTHANC_WSI_VERSION})
+set_target_properties(OrthancWSI PROPERTIES
+  NO_SONAME ON
+  LINK_FLAGS "-Wl,-soname,libOrthancWSI.so.${ORTHANC_WSI_VERSION}"
+  )
 
 install(
   TARGETS OrthancWSI

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