Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes for upgraded DCMTK and web-assembly build #496

Merged
merged 5 commits into from
Jun 21, 2024
Merged

Fixes for upgraded DCMTK and web-assembly build #496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d7b56e0
fix: includes for higher version of DCMTK (> v366)
jadh4v Jun 6, 2024
d7b4dec
comp: do not reuse prebuilt DCMTK/ITK/ZLIB
fedorov Jun 7, 2024
8bcb6ef
ci: bump timeout for windows
fedorov Jun 7, 2024
0938c33
ci: switch to windows-2019 image
fedorov Jun 8, 2024
1cfe717
ci: switch back to 2022 from 2019 Windows image
fedorov Jun 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/cmake-win.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ jobs:

build-windows:

runs-on: windows-latest
timeout-minutes: 30
runs-on: windows-2022
timeout-minutes: 360

steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -57,7 +57,7 @@ jobs:
echo "Step 2"
cd ${{ github.workspace }}\dcmqi-build
echo "Step 3"
cmake -G "Visual Studio 17 2022" -Ax64 -DITK_DIR:PATH=c:\ITK-install\lib\cmake\ITK-5.3 -DDCMTK_DIR:PATH=c:\DCMTK-install\cmake -DZLIB_ROOT:PATH=c:\zlib-install -DZLIB_INCLUDE_DIR:PATH=c:\zlib-install\include -DZLIB_LIBRARY:FILEPATH=c:\zlib-install\lib\zlib.lib -DBUILD_SHARED_LIBS:BOOL=OFF ${{ github.workspace }}
cmake -G "Visual Studio 17 2022" -Ax64 -DBUILD_SHARED_LIBS:BOOL=OFF ${{ github.workspace }}

- name: Build dcmqi
run: |
Expand All @@ -81,7 +81,7 @@ jobs:

publish-windows:

runs-on: windows-latest
runs-on: windows-2019
timeout-minutes: 5
# Only run if the event is not a pull request and the repository owner is QIICR.
# The latter is to prevent forks from publishing packages even if the owner's token
Expand All @@ -108,4 +108,4 @@ jobs:
--prerelease-packages "${{ github.workspace }}\dcmqi-build\dcmqi-build\dcmqi-*-win64-*.zip" `
--prerelease-packages-clear-pattern "dcmqi-*-win64-*" `
--prerelease-packages-keep-pattern "*<COMMIT_DATE>-<COMMIT_SHORT_SHA>*" `
--token ${{ secrets.GA_TOKEN }}
--token ${{ secrets.GA_TOKEN }}
7 changes: 7 additions & 0 deletions libsrc/Itk2DicomConverter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@
#include "dcmqi/JSONSegmentationMetaInformationHandler.h"

// DCMTK includes
#include <dcmtk/config/osconfig.h>
#if defined(PACKAGE_VERSION_NUMBER) && PACKAGE_VERSION_NUMBER > 366
#include <dcmtk/dcmdata/dcuid.h>
#include <dcmtk/dcmdata/dcvrda.h>
#include <dcmtk/dcmdata/dcvrtm.h>
#include <dcmtk/dcmfg/fgfracon.h>
#endif
#include <dcmtk/dcmsr/codes/dcm.h>


Expand Down
11 changes: 11 additions & 0 deletions libsrc/ParaMapConverter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,17 @@
#include "dcmqi/ParaMapConverter.h"

// DCMTK includes
#include <dcmtk/config/osconfig.h>
#if defined(PACKAGE_VERSION_NUMBER) && PACKAGE_VERSION_NUMBER > 366
#include <dcmtk/dcmdata/dcuid.h>
#include <dcmtk/dcmdata/dcvrda.h>
#include <dcmtk/dcmdata/dcvrtm.h>
#include <dcmtk/dcmfg/fgfracon.h>
#include <dcmtk/dcmfg/fgframeanatomy.h>
#include <dcmtk/dcmfg/fgparametricmapframetype.h>
#include <dcmtk/dcmfg/fgpixeltransform.h>
#include <dcmtk/dcmfg/fgrealworldvaluemapping.h>
#endif
#include <dcmtk/dcmsr/codes/dcm.h>
#include <dcmtk/dcmsr/codes/sct.h>
#include <dcmtk/dcmsr/codes/ucum.h>
Expand Down
Loading