refactor: Migrate read-dicom to packages/dicom/gdcm/

InsightSoftwareConsortium · Jun 21, 2023 · 86f3035 · 86f3035
1 parent 533e5ce
commit 86f3035
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 23 deletions.
diff --git a/packages/dicom/CMakeLists.txt b/packages/dicom/CMakeLists.txt
@@ -3,4 +3,5 @@ project(itkwasm-dicom)
 
 set(CMAKE_CXX_STANDARD 17)
 
+add_subdirectory(gdcm)
 add_subdirectory(dcmtk)
diff --git a/...pipelines/image/read-dicom/CMakeLists.txt → packages/dicom/gdcm/CMakeLists.txt b/...pipelines/image/read-dicom/CMakeLists.txt → packages/dicom/gdcm/CMakeLists.txt
@@ -1,8 +1,3 @@
-cmake_minimum_required(VERSION 3.16)
-project(read-dicom)
-
-set(CMAKE_CXX_STANDARD 17)
-
 find_package(ITK REQUIRED
   COMPONENTS ITKCommon
     ITKGDCM
@@ -15,14 +10,7 @@ include(${ITK_USE_FILE})
 add_executable(read-image-dicom-file-series read-image-dicom-file-series.cxx)
 target_link_libraries(read-image-dicom-file-series PUBLIC ${ITK_LIBRARIES})
 
-if (WASI AND DEFINED WebAssemblyInterface_BINARY_DIR)
-  itk_module_target_label(read-image-dicom-file-series)
-  itk_module_target_export(read-image-dicom-file-series)
-  itk_module_target_install(read-image-dicom-file-series)
-  set_property(TARGET read-image-dicom-file-series
-    PROPERTY RUNTIME_OUTPUT_DIRECTORY
-    ${WebAssemblyInterface_BINARY_DIR}/wasi-image-io
-    )
+if (WASI)
   return()
 endif()
 
@@ -75,7 +63,7 @@ add_dependencies(${Iconv} ${Iconv_LIBRARY})
 add_executable(read-dicom-tags read-dicom-tags.cxx)
 target_link_libraries(read-dicom-tags PUBLIC ${ITK_LIBRARIES} ${Iconv_LIBRARIES} ${Iconv})
 
-if (EMSCRIPTEN AND DEFINED WebAssemblyInterface_BINARY_DIR)
+if (EMSCRIPTEN)
   foreach(dicom_io_module
       read-image-dicom-file-series
       read-dicom-tags
@@ -84,16 +72,9 @@ if (EMSCRIPTEN AND DEFINED WebAssemblyInterface_BINARY_DIR)
     set(target_umd "${dicom_io_module}.umd")
     set(dicom_common_link_flags " ${common_link_flags} -s SUPPORT_LONGJMP=1 -s DISABLE_EXCEPTION_CATCHING=0")
     foreach(target ${target_esm} ${target_umd})
-      itk_module_target_label(${target})
-      itk_module_target_export(${target})
-      itk_module_target_install(${target})
-      set_property(TARGET ${target}
-        PROPERTY RUNTIME_OUTPUT_DIRECTORY
-        ${WebAssemblyInterface_BINARY_DIR}/image-io
-        )
       set_property(TARGET ${target} APPEND_STRING
         PROPERTY LINK_FLAGS " ${dicom_common_link_flags}"
         )
     endforeach()
   endforeach()
-endif()
+endif()
diff --git a/...ines/image/read-dicom/read-dicom-tags.cxx → packages/dicom/gdcm/read-dicom-tags.cxx b/...ines/image/read-dicom/read-dicom-tags.cxx → packages/dicom/gdcm/read-dicom-tags.cxx
diff --git a/...ad-dicom/read-image-dicom-file-series.cxx → ...com/gdcm/read-image-dicom-file-series.cxx b/...ad-dicom/read-image-dicom-file-series.cxx → ...com/gdcm/read-image-dicom-file-series.cxx
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -38,7 +38,6 @@ endif()
 
 include(${CMAKE_CURRENT_SOURCE_DIR}/../CMake/BuildZstd.cmake)
 add_subdirectory(io/internal/pipelines/image/convert-image)
-add_subdirectory(io/internal/pipelines/image/read-dicom)
 add_subdirectory(io/internal/pipelines/mesh/convert-mesh)
 add_subdirectory(io/internal/pipelines/mesh/mesh-to-polydata)