Skip to content

Commit b24426b

Browse files
committed
build: Add dcmqi as dependency for read/write DICOM seg objects
1 parent 922238f commit b24426b

File tree

2 files changed

+30
-6
lines changed

2 files changed

+30
-6
lines changed

packages/dicom/dcmtk/CMakeLists.txt

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,30 @@ find_package(ITK REQUIRED
55
)
66
include(${ITK_USE_FILE})
77

8+
if(POLICY CMP0077)
9+
set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
10+
endif()
11+
12+
include(FetchContent)
13+
# DCMQI
14+
set(DCMQI_GIT_REPOSITORY "https://github.com/jadh4v/dcmqi.git")
15+
set(DCMQI_GIT_TAG "0938c3341b7b259657aff4485e9178b95385afb7")
16+
set(DCMQI_SUPERBUILD OFF)
17+
set(DCMQI_BUILD_SLICER_EXTENSION OFF)
18+
set(DCMQI_BUILD_APPS OFF)
19+
set(DCMQI_BUILD_DOC OFF)
20+
set(BUILD_TESTING OFF)
21+
set(DCMTK_DIR ${ITK_DIR}/Modules/ThirdParty/DCMTK/ITKDCMTK_ExtProject-build)
22+
FetchContent_Declare(
23+
dcmqi_lib
24+
GIT_REPOSITORY ${DCMQI_GIT_REPOSITORY}
25+
GIT_TAG ${DCMQI_GIT_TAG}
26+
)
27+
28+
FetchContent_MakeAvailable(dcmqi_lib)
29+
30+
set(DCMQI_INCLUDE_DIR "${dcmqi_lib_SOURCE_DIR}/include")
31+
832
add_executable(structured-report-to-text structured-report-to-text.cxx)
933
target_link_libraries(structured-report-to-text PUBLIC ${ITK_LIBRARIES})
1034

src/docker/itk-wasm-base/Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,19 +33,19 @@ RUN curl -L https://github.com/api/repos/facebook/zstd/tarball/${zstd_GIT_TAG} |
3333
cd .. && \
3434
rm -rf zstd-build zstd
3535

36-
# tag commit date: 2024-08-01
37-
ENV ITK_GIT_TAG 31b51f299ac12f9e4d56a18e6020127f359cb426
38-
ENV ITK_GIT_BRANCH itkwasm-2024-05-20-5db055d7ad3b-1
39-
RUN git clone --branch $ITK_GIT_BRANCH --single-branch --depth 1 https://github.com/KitwareMedical/ITK.git && \
36+
# tag commit date: 2024-08-13
37+
ENV ITK_GIT_TAG 75cc495bc86c404c57ed44b4cb3858cdde120425
38+
ENV ITK_GIT_BRANCH itkwasm-2024-06-06
39+
RUN git clone --branch $ITK_GIT_BRANCH --single-branch --depth 1 https://github.com/jadh4v/ITK.git && \
4040
sed -i -e '/^option(OPJ_USE_THREAD/c\option(OPJ_USE_THREAD "use threads" OFF)' \
4141
/ITK/Modules/ThirdParty/GDCM/src/gdcm/Utilities/gdcmopenjpeg/src/lib/openjp2/CMakeLists.txt
4242

4343
# Modify CMake variable to use patched DCMTK library
4444
# GIT_TAG refers to DCMTK branch: 20240311_DCMTK_PATCHES_FOR_ITK-wasm
45-
RUN sed -i -e '/^set(DCMTK_GIT_REPOSITORY/c\set(DCMTK_GIT_REPOSITORY "https://github.com/InsightSoftwareConsortium/DCMTK.git")' \
45+
RUN sed -i -e '/^set(DCMTK_GIT_REPOSITORY/c\set(DCMTK_GIT_REPOSITORY "https://github.com/jadh4v/DCMTK.git")' \
4646
/ITK/Modules/ThirdParty/DCMTK/DCMTKGitTag.cmake
4747

48-
RUN sed -i -e '/^set(DCMTK_GIT_TAG/c\set(DCMTK_GIT_TAG "fe7cff5de40b67ae0490d476ddf17689c06bcaf4")' \
48+
RUN sed -i -e '/^set(DCMTK_GIT_TAG/c\set(DCMTK_GIT_TAG "e356f2929f84567603e39a3191d2ad5159adb703")' \
4949
/ITK/Modules/ThirdParty/DCMTK/DCMTKGitTag.cmake
5050

5151
RUN if test -e $WASI_SDK_PATH/share/cmake/wasi-sdk.cmake; then sed -i '/cmake_minimum_required/d' $WASI_SDK_PATH/share/cmake/wasi-sdk.cmake; fi

0 commit comments

Comments
 (0)