Embed oficonv data, list correct install dir.

michaelonken · Jan 5, 2024 · 10bb663 · 10bb663
1 parent 2a5eac4
commit 10bb663
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/.github/workflows/cmake-win.yml b/.github/workflows/cmake-win.yml
@@ -62,7 +62,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" -DBUILD_SHARED_LIBS:BOOL=ON -DCMAKE_INSTALL_PREFIX:PATH=${{ github.workspace }}\dcmtk-${{ env.NOW }}  ${{ github.workspace }}
+          cmake -G "Visual Studio 17 2022" -Ax64 -DDCMTK_MODULES:STR="ofstd;oflog;oficonv;dcmdata" -DDCMTK_ENABLE_BUILTIN_OFICONV_DATA:BOOL=On -DBUILD_SHARED_LIBS:BOOL=ON -DCMAKE_INSTALL_PREFIX:PATH=${{ github.workspace }}\dcmtk-${{ env.NOW }}  ${{ github.workspace }}
 
       - name: Build dcmtk
         run: |
@@ -80,7 +80,7 @@ jobs:
           cmake --build . --config Release --target INSTALL -- /m
           Compress-Archive -Path ${{ github.workspace }}\dcmtk-${{ env.NOW }} -Destination ${{ github.workspace }}\dcmtk-${{ env.NOW }}\dcmtk-${{ env.NOW }}-win64.zip
           echo "Listing install dir: ${{ github.workspace }}\dcmtk-${{ env.NOW }}"
-          ls ${{ github.workspace }}\dcmtk-install
+          ls ${{ github.workspace }}\dcmtk-${{ env.NOW }}
 
       - uses: actions/upload-artifact@v3
         with: