# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1355735205 -3600
# Node ID 6c4f6229aad784a44f807198aa2daccfd23042ce
# Parent  1c8384e8408c28ec8e6d9859bf45df970e308d95
fix in embedding dictionaries

diff -r 1c8384e8408c -r 6c4f6229aad7 OrthancServer/DicomProtocol/DicomServer.cpp
--- a/OrthancServer/DicomProtocol/DicomServer.cpp	Fri Dec 14 15:37:12 2012 +0100
+++ b/OrthancServer/DicomProtocol/DicomServer.cpp	Mon Dec 17 10:06:45 2012 +0100
@@ -76,7 +76,7 @@
     /* Disable "gethostbyaddr" (which results in memory leaks) and use raw IP addresses */
     dcmDisableGethostbyaddr.set(OFTrue);
 
-#if ORTHANC_STANDALONE == 1
+#if DCMTK_USE_EMBEDDED_DICTIONARIES == 1
     LOG(WARNING) << "Loading the embedded dictionaries";
     dcmDataDict.clear();
     DcmDataDictionary& d = dcmDataDict.wrlock();
diff -r 1c8384e8408c -r 6c4f6229aad7 Resources/CMake/DcmtkConfiguration.cmake
--- a/Resources/CMake/DcmtkConfiguration.cmake	Fri Dec 14 15:37:12 2012 +0100
+++ b/Resources/CMake/DcmtkConfiguration.cmake	Mon Dec 17 10:06:45 2012 +0100
@@ -70,13 +70,12 @@
 
   set(DCMTK_BUNDLES_LOG4CPLUS 1)
 
-  if (${STANDALONE_BUILD})
-    set(DCMTK_DICTIONARIES
-      DICTIONARY_DICOM ${DCMTK_SOURCES_DIR}/dcmdata/data/dicom.dic
-      DICTIONARY_PRIVATE ${DCMTK_SOURCES_DIR}/dcmdata/data/private.dic
-      DICTIONARY_DICONDE ${DCMTK_SOURCES_DIR}/dcmdata/data/diconde.dic
-      )
-  endif()
+  add_definitions(-DDCMTK_USE_EMBEDDED_DICTIONARIES=1)
+  set(DCMTK_DICTIONARIES
+    DICTIONARY_DICOM ${DCMTK_SOURCES_DIR}/dcmdata/data/dicom.dic
+    DICTIONARY_PRIVATE ${DCMTK_SOURCES_DIR}/dcmdata/data/private.dic
+    DICTIONARY_DICONDE ${DCMTK_SOURCES_DIR}/dcmdata/data/diconde.dic
+    )
 
 else()
   # The following line allows to manually add libraries at the
@@ -112,6 +111,8 @@
     DCMTK_VERSION_NUMBER 
     ${DCMTK_VERSION_NUMBER1})
 
+  add_definitions(-DDCMTK_USE_EMBEDDED_DICTIONARIES=0)
+
 endif()
 
 add_definitions(-DDCMTK_VERSION_NUMBER=${DCMTK_VERSION_NUMBER})