Fix linking against recent DCMTK version(s).

QIICR · Jun 22, 2024 · dd6e8c3 · dd6e8c3
1 parent d1c686d
commit dd6e8c3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/apps/seg/itkimage2segimage.cxx b/apps/seg/itkimage2segimage.cxx
@@ -120,9 +120,10 @@ int main(int argc, char *argv[])
     }
     segmentations = segmentationsReordered;
   }
-
+  // Copy to DcmItem* vector to use it in itkimage2dcmSegmentation() call
+  std::vector<DcmItem*> dcmItems(dcmDatasets.begin(), dcmDatasets.end());
   try {
-    DcmDataset* result = dcmqi::Itk2DicomConverter::itkimage2dcmSegmentation(dcmDatasets,
+    DcmDataset* result = dcmqi::Itk2DicomConverter::itkimage2dcmSegmentation(dcmItems,
                                                                              segmentations,
                                                                              metadata,
                                                                              skipEmptySlices,

diff --git a/libsrc/CMakeLists.txt b/libsrc/CMakeLists.txt
@@ -72,14 +72,9 @@ set(_dcmtk_libs)
 set(_dcmtk_includes)
 if(TARGET DCMTK::DCMTK)
   set(_dcmtk_libs DCMTK::DCMTK)
-  # TODO
-  MESSAGE(STATUS "------------------------------------- DCMTK::DCMTK: _dcmtk_libs1: ${_dcmtk_libs} --------------------------------")
 else()
-  set(_dcmtk_libs ${DCMTK_LIBRARIES})
+  set(_dcmtk_libs DCMTK::DCMTK)
   set(_dcmtk_includes ${DCMTK_INCLUDE_DIRS})
-  # TODO
-  MESSAGE(STATUS "------------------------------------- DCMTK::DCMTK: ${DCMTK_LIBRARIES} --------------------------------")
-  MESSAGE(STATUS "------------------------------------- DCMTK::DCMTK: _dcmtk_libs2: ${_dcmtk_libs} --------------------------------")
 endif()
 
 set(${lib_name}_INCLUDE_DIRS
@@ -104,8 +99,6 @@ target_link_libraries(${lib_name} PUBLIC
   ${ITK_LIBRARIES}
   $<$<NOT:$<BOOL:${DCMQI_BUILTIN_JSONCPP}>>:${JsonCpp_LIBRARY}>
   )
-  # TODO
-  MESSAGE(STATUS "------------------------------------- DCMTK::DCMTK: _dcmtk_libs3: ${_dcmtk_libs} --------------------------------")
 
 if(export_targets)
   install(TARGETS ${lib_name}