From 53d2c8f9c7ad734ac5cb5af7b2273d8b296ce262 Mon Sep 17 00:00:00 2001 From: Michael Onken Date: Thu, 11 Jan 2024 15:23:18 +0100 Subject: [PATCH] Qualify support dir cmake variable. --- .github/workflows/cmake-win.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cmake-win.yml b/.github/workflows/cmake-win.yml index c6cc114c0a..14e76aef33 100644 --- a/.github/workflows/cmake-win.yml +++ b/.github/workflows/cmake-win.yml @@ -31,7 +31,10 @@ jobs: run: | C:\msys64\usr\bin\wget.exe -O dcmtk_support.zip https://dicom.offis.de/download/dcmtk/dcmtk368/support/dcmtk-3.6.8-win64-support-MT-msvc-17.4.zip - # Uncompress support libraries into directory c:\dcmtk_support\libs + # Uncompress support libraries into directory c:\dcmtk_support\libs. + # We rename the original directory to libs so that the rest of the script + # can use the ame path even if the support library package is updated + # in the future in the download task above. - name: Uncompress Support libraries shell: pwsh run: | @@ -57,7 +60,7 @@ jobs: echo "Step 2" cd ${{ github.workspace }}\dcmtk-build echo "Step 3" - cmake -G "Visual Studio 17 2022" -Ax64 -DDCMTK_MODULES:STR="ofstd;oflog;oficonv;dcmdata;dcmimgle;dcmimage;dcmjpeg;dcmjpls;dcmtls;dcmnet;dcmsr;dcmsign;dcmwlm;dcmqrdb;dcmpstat;dcmrt;dcmiod;dcmfg;dcmseg;dcmtract;dcmpmap;dcmect" -DDCMTK_ENABLE_BUILTIN_OFICONV_DATA:BOOL=On -DBUILD_SHARED_LIBS:BOOL=ON -DDCMTK_SUPPORT_LIBRARIES_DIR=C:\support_libs\libs -DCMAKE_INSTALL_PREFIX:PATH=${{ github.workspace }}\dcmtk-${{ env.NOW }}-${{ env.COMMIT_SHORT_SHA }} ${{ github.workspace }} + cmake -G "Visual Studio 17 2022" -Ax64 -DDCMTK_MODULES:STR="ofstd;oflog;oficonv;dcmdata;dcmimgle;dcmimage;dcmjpeg;dcmjpls;dcmtls;dcmnet;dcmsr;dcmsign;dcmwlm;dcmqrdb;dcmpstat;dcmrt;dcmiod;dcmfg;dcmseg;dcmtract;dcmpmap;dcmect" -DDCMTK_ENABLE_BUILTIN_OFICONV_DATA:BOOL=On -DBUILD_SHARED_LIBS:BOOL=ON -DDCMTK_SUPPORT_LIBRARIES_DIR:PATH=C:\support_libs\libs -DCMAKE_INSTALL_PREFIX:PATH=${{ github.workspace }}\dcmtk-${{ env.NOW }}-${{ env.COMMIT_SHORT_SHA }} ${{ github.workspace }} - name: Build dcmtk run: |