fine

Tencent · May 23, 2024 · 0714dc8 · 0714dc8
1 parent f4df42b
commit 0714dc8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/.github/workflows/windows-clang.yml b/.github/workflows/windows-clang.yml
@@ -37,7 +37,7 @@ jobs:
 
     env:
       UseMultiToolTask: true
-      NCNN_CMAKE_OPTIONS: -DNCNN_BUILD_TESTS=ON -DNCNN_BUILD_TOOLS=OFF -DNCNN_BUILD_EXAMPLES=OFF
+      NCNN_CMAKE_OPTIONS: -DNCNN_BUILD_TOOLS=OFF -DNCNN_BUILD_EXAMPLES=OFF
 
     steps:
     - uses: actions/checkout@v4
@@ -53,33 +53,33 @@ jobs:
     - name: arm64-vulkan
       run: |
         mkdir build-arm64-vulkan; cd build-arm64-vulkan
-        cmake -T ClangCL -A arm64 ${{ env.NCNN_CMAKE_OPTIONS }} -DNCNN_VULKAN=ON ..
+        cmake -T ClangCL -A arm64 ${{ env.NCNN_CMAKE_OPTIONS }} -DNCNN_VULKAN=ON -DNCNN_SHARED_LIB=ON ..
         cmake --build . --config Release -j 4
 
     - name: x86
       run: |
         mkdir build-x86; cd build-x86
-        cmake -T ClangCL -A Win32 ${{ env.NCNN_CMAKE_OPTIONS }} -DNCNN_VULKAN=OFF ..
+        cmake -T ClangCL -A Win32 ${{ env.NCNN_CMAKE_OPTIONS }} -DNCNN_BUILD_TESTS=ON -DNCNN_VULKAN=OFF ..
         cmake --build . --config Release -j 4
     - name: x86-test
       run: cd build-x86; ctest -C Release --output-on-failure -j 4
 
     - name: x86-vulkan
       run: |
         mkdir build-x86-vulkan; cd build-x86-vulkan
-        cmake -T ClangCL -A Win32 ${{ env.NCNN_CMAKE_OPTIONS }} -DNCNN_VULKAN=ON ..
+        cmake -T ClangCL -A Win32 ${{ env.NCNN_CMAKE_OPTIONS }} -DNCNN_VULKAN=ON -DNCNN_SHARED_LIB=ON ..
         cmake --build . --config Release -j 4
 
     - name: x64
       run: |
         mkdir build-x64; cd build-x64
-        cmake -T ClangCL -A x64 ${{ env.NCNN_CMAKE_OPTIONS }} -DNCNN_VULKAN=OFF ..
+        cmake -T ClangCL -A x64 ${{ env.NCNN_CMAKE_OPTIONS }} -DNCNN_BUILD_TESTS=ON -DNCNN_VULKAN=OFF ..
         cmake --build . --config Release -j 4
     - name: x64-test
       run: cd build-x64; ctest -C Release --output-on-failure -j 4
 
     - name: x64-vulkan
       run: |
         mkdir build-x64-vulkan; cd build-x64-vulkan
-        cmake -T ClangCL -A x64 ${{ env.NCNN_CMAKE_OPTIONS }} -DNCNN_VULKAN=ON ..
+        cmake -T ClangCL -A x64 ${{ env.NCNN_CMAKE_OPTIONS }} -DNCNN_VULKAN=ON -DNCNN_SHARED_LIB=ON ..
         cmake --build . --config Release -j 4
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -133,9 +133,10 @@ endif()
 
 ##############################################
 
+include(CheckCXXCompilerFlag)
+
 # gnu inline assembly in clang msvc does not work actually
 if(NOT (CMAKE_CXX_COMPILER_ID MATCHES "MSVC" OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND CMAKE_CXX_SIMULATE_ID MATCHES "MSVC" AND CMAKE_CXX_COMPILER_FRONTEND_VARIANT MATCHES "MSVC")))
-    include(CheckCXXCompilerFlag)
     check_cxx_source_compiles("int main() { int a = 0; asm volatile(\"\" : \"=r\"(a) : \"0\"(a) : \"memory\"); return 0; }" NCNN_COMPILER_SUPPORT_GNU_INLINE_ASM)
     if(NCNN_COMPILER_SUPPORT_GNU_INLINE_ASM)
         option(NCNN_GNU_INLINE_ASM "optimize platform with gnu style inline assembly" ON)