disable the shared_library option

Tencent · Sep 8, 2024 · 4c67e37 · 4c67e37
1 parent bfea88c
commit 4c67e37
Showing 1 changed file with 14 additions and 12 deletions.
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -119,6 +119,19 @@ jobs:
         Copy-Item -Path "$env:GITHUB_WORKSPACE\swiftshader-install\vulkan-1.dll" -Destination 'build-x64\tests'
         cd build-x64; ctest -C Release --output-on-failure -j 4
 
+    - name: x64-simpleomp
+      run: |
+          mkdir build-x64-simpleomp; cd build-x64-simpleomp
+          cmake -T ${{ matrix.toolset-version }},host=x64 -A x64 -Dprotobuf_DIR="$env:GITHUB_WORKSPACE\protobuf-install\cmake" -DNCNN_SHARED_LIB=OFF -DNCNN_VULKAN=ON -DNCNN_SIMPLEOMP=ON -DNCNN_BUILD_TESTS=ON ..
+          cmake --build . --config Release -j 4
+    - name: x64-simpleomp-test
+      if: matrix.vs-version != 'vs2015' && matrix.vs-version != 'vs2017'
+      run: |
+        echo "[Processor]`nThreadCount=1`n" > build-x64-simpleomp/tests/Release/SwiftShader.ini
+        Copy-Item -Path "build-x64-simpleomp\src\Release\ncnn.dll" -Destination 'build-x64-simpleomp\tests'
+        Copy-Item -Path "$env:GITHUB_WORKSPACE\swiftshader-install\vulkan-1.dll" -Destination 'build-x64-simpleomp\tests'
+        cd build-x64-simpleomp; ctest -C Release --output-on-failure -j 4
+
     - name: x64-sse2
       run: |
         mkdir build-x64-sse2; cd build-x64-sse2
@@ -145,17 +158,6 @@ jobs:
         Copy-Item -Path "build-x86\src\Release\ncnn.dll" -Destination 'build-x86\tests'
         cd build-x86; ctest -C Release --output-on-failure -j 4
 
-    - name: x64-simpleomp
-      run: |
-        mkdir build-x64-simpleomp; cd build-x64-simpleomp
-        cmake -T ${{ matrix.toolset-version }},host=x64 -A x64 -Dprotobuf_DIR="$env:GITHUB_WORKSPACE\protobuf-install\cmake" -DNCNN_SHARED_LIB=ON -DNCNN_VULKAN=OFF -DNCNN_SIMPLEOMP=ON -DNCNN_BUILD_TESTS=ON ..
-        cmake --build . --config Release -j 4
-    - name: x64-simpleomp-test
-      if: matrix.vs-version != 'vs2015' && matrix.vs-version != 'vs2017'
-      run: |
-        Copy-Item -Path "build-x64-simpleomp\src\Release\ncnn.dll" -Destination 'build-x64-simpleomp\tests'
-        cd build-x64-simpleomp; ctest -C Release --output-on-failure -j 4
-# echo "[Processor]`nThreadCount=1`n" > build-x64-simpleomp/tests/Release/SwiftShader.ini
-# Copy-Item -Path "$env:GITHUB_WORKSPACE\swiftshader-install\vulkan-1.dll" -Destination 'build-x64-simpleomp\tests'
+