Commit 6778a9ad authored by Gert Wollny's avatar Gert Wollny

Update search path for dicomdict, Closes: #873024

parent ec13c7d5
......@@ -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++)
......
......@@ -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
......
......@@ -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
......
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