Prechádzať zdrojové kódy

Merge branch 'main' of github.com:libigl/libigl into main

Alec Jacobson 3 rokov pred
rodič
commit
5a2180321c
1 zmenil súbory, kde vykonal 5 pridanie a 6 odobranie
  1. 5 6
      .github/workflows/continuous.yml

+ 5 - 6
.github/workflows/continuous.yml

@@ -61,7 +61,7 @@ jobs:
 
       - name: Cache Build
         id: cache-build
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: ~/.ccache
           key: ${{ runner.os }}-${{ matrix.config }}-${{ matrix.static }}-cache
@@ -79,8 +79,7 @@ jobs:
             -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
             -DCMAKE_BUILD_TYPE=${{ matrix.config }} \
             -DLIBIGL_USE_STATIC_LIBRARY=${{ matrix.static }} \
-            -DLIBIGL_COPYLEFT_WITH_CGAL=ON \
-            -DLIBIGL_COPYLEFT_WITH_CORK=ON
+            -DLIBIGL_WITH_COPYLEFT_CGAL=ON 
 
       - name: Build
         run: cd build; make -j2; ccache --show-stats
@@ -116,11 +115,12 @@ jobs:
 
       - name: Cache build
         id: cache-build
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: ${{ env.appdata }}\Mozilla\sccache
           key: ${{ runner.os }}-${{ matrix.config }}-${{ matrix.static }}-cache
 
+
       - name: Prepare sccache
         run: |
           Invoke-Expression (New-Object System.Net.WebClient).DownloadString('https://get.scoop.sh')
@@ -138,8 +138,7 @@ jobs:
             -DCMAKE_CXX_COMPILER_LAUNCHER=sccache ^
             -DCMAKE_BUILD_TYPE=${{ matrix.config }} ^
             -DLIBIGL_USE_STATIC_LIBRARY=${{ matrix.static }} ^
-            -DLIBIGL_COPYLEFT_WITH_CGAL=ON ^
-            -DLIBIGL_COPYLEFT_WITH_CORK=ON ^
+            -DLIBIGL_WITH_COPYLEFT_CGAL=ON ^
             -DCMAKE_JOB_POOLS=pool-linking=1;pool-compilation=1 ^
             -DCMAKE_JOB_POOL_COMPILE:STRING=pool-compilation ^
             -DCMAKE_JOB_POOL_LINK:STRING=pool-linking ^