Merge remote-tracking branch 'aous72/master' into merge/aous72-20240802

cornerstonejs · Aug 2, 2024 · c0d46c9 · c0d46c9
2 parents 0da149a + 987c654
commit c0d46c9
Show file tree

Hide file tree

Showing 84 changed files with 9,321 additions and 3,453 deletions.
diff --git a/.github/workflows/ccp-workflow.yml b/.github/workflows/ccp-workflow.yml
@@ -5,28 +5,52 @@ on: push
 
 jobs:
   build:
-    name: main build for Unix-like
-    runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-latest, ubuntu-20.04, ubuntu-latest]
+        include: [
+          { system: MacOS,          runner: macos-latest },
+          { system: Ubuntu-20,      runner: ubuntu-20.04 },
+          { system: Ubuntu-latest,  runner: ubuntu-latest },
+        ]
+    name: ${{ matrix.system }} Build
+    runs-on: ${{ matrix.runner }}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: cmake
-      run: cmake ..
+      run: cmake -DOJPH_BUILD_STREAM_EXPAND=ON ..
       working-directory: build
     - name: build
       run: make
       working-directory: build
 
+  build_windows:
+    strategy:
+      matrix:
+        include: [
+          { system: Windows,  runner: windows-latest },
+        ]
+    name: ${{ matrix.system }} Build
+    runs-on: ${{ matrix.runner }}
+    steps:
+    - uses: actions/checkout@v4
+    - name: cmake
+      run: cmake -G "Visual Studio 17 2022" -A x64 -DOJPH_ENABLE_TIFF_SUPPORT=OFF -DOJPH_BUILD_STREAM_EXPAND=ON ..
+      working-directory: build
+    - name: build
+      run: cmake --build . --config Release
+      working-directory: build
+
   test:
-    name: tests on Linux and MacOS
-    runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-latest, ubuntu-latest]
+        include: [
+          { system: MacOS,          runner: macos-latest },
+          { system: Ubuntu-latest,  runner: ubuntu-latest },
+        ]
+    name: ${{ matrix.system }} Test
+    runs-on: ${{ matrix.runner }}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: cmake
       run: cmake -DOJPH_BUILD_TESTS=yes ..
       working-directory: build
@@ -38,15 +62,17 @@ jobs:
       working-directory: build
 
   test_windows:
-    name: tests on Windows
-    runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [windows-latest]
+        include: [
+          { system: Windows,  runner: windows-latest },
+        ]
+    name: ${{ matrix.system }} Test
+    runs-on: ${{ matrix.runner }}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: cmake
-      run: cmake -G "Visual Studio 17 2022" -A x64 -DOJPH_ENABLE_TIFF_SUPPORT=off -DOJPH_BUILD_TESTS=yes ..
+      run: cmake -G "Visual Studio 17 2022" -A x64 -DOJPH_ENABLE_TIFF_SUPPORT=OFF -DOJPH_BUILD_TESTS=ON ..
       working-directory: build
     - name: build
       run: cmake --build . --config Release

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -38,7 +38,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        language: [ 'cpp', 'python' ]
+        language: [ 'cpp' ]
         # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby', 'swift' ]
         # Use only 'java' to analyze code written in Java, Kotlin or both
         # Use only 'javascript' to analyze code written in JavaScript, TypeScript or both

diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,7 @@
 .DS_Store
 mytest/*
 others/*
+lib/*
 
 .vscode
 build.sh