Mercurial > hg > orthanc

changeset 2149:e438b5964d77

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix dcmtk 3.6.1 build
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 14 Nov 2016 10:58:13 +0100
parents e18023c2fdfb
children 9a272d552c27
files Resources/CMake/DcmtkConfiguration.cmake
diffstat 1 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/Resources/CMake/DcmtkConfiguration.cmake	Thu Nov 10 08:47:31 2016 +0100
+++ b/Resources/CMake/DcmtkConfiguration.cmake	Mon Nov 14 10:58:13 2016 +0100
@@ -65,6 +65,11 @@
   if (USE_DCMTK_361)
     # This step must be after the generation of "osconfig.h"
     INSPECT_FUNDAMENTAL_ARITHMETIC_TYPES()
+  else()
+    # Removing this file is required with DCMTK 3.6.0
+    list(REMOVE_ITEM DCMTK_SOURCES 
+      ${DCMTK_SOURCES_DIR}/dcmdata/libsrc/dcdictbi.cc
+      )
   endif()
 
   AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmdata/libsrc DCMTK_SOURCES)
@@ -181,7 +186,6 @@
   list(REMOVE_ITEM DCMTK_SOURCES 
     ${DCMTK_SOURCES_DIR}/dcmdata/libsrc/mkdictbi.cc
     ${DCMTK_SOURCES_DIR}/dcmdata/libsrc/mkdeftag.cc
-    ${DCMTK_SOURCES_DIR}/dcmdata/libsrc/dcdictbi.cc
     )
 
   #set_source_files_properties(${DCMTK_SOURCES}