更新cmake脚本, 便于支持modern cmake依赖方式

.github/workflows/android-ci.yml → .github/workflows/Android.yml

@@ -1,4 +1,4 @@
-name: CMake-Android
+name: Android
 
 on:
   push:
@@ -7,8 +7,9 @@ on:
     branches: [ master ]
 
 env:
-  # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
-  BUILD_TYPE: Release
+  # Specifies the available build types (configurations), e.g. Debug, Release, RelWithDebInfo, MinSizeRel, etc.
+  # https://cmake.org/cmake/help/latest/variable/CMAKE_CONFIGURATION_TYPES.html
+  CMAKE_CONFIGURATION_TYPES: "Release;Debug;RelWithDebInfo;MinSizeRel"
 
 jobs:
   build:
@@ -18,6 +19,7 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-latest ]
+        config: [ Release, Debug, RelWithDebInfo, MinSizeRel ]
     runs-on: ${{ matrix.os }}
 
     steps:
@@ -26,20 +28,20 @@ jobs:
     - uses: nttld/setup-ndk@v1
       id: setup-ndk
       with:
-        ndk-version: r25
+        ndk-version: r27
         add-to-path: false
     - run: echo ${{env.ANDROID_NDK_HOME}}
       env:
         ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}
 
-
-   # - name: Configure CMake
-      # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
-      # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
-   #   run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
-
-    - name: Build
-      # Build your program with the given configuration
-      run: mkdir ${{github.workspace}}/build; cd ${{github.workspace}}/build; cmake .. -DCMAKE_TOOLCHAIN_FILE=${{env.ANDROID_NDK_HOME}}/build/cmake/android.toolchain.cmake  -DANDROID_ABI=arm64-v8a  -DANDROID_PLATFORM=android-23;make
+    - name: Configure CMake
+      run: cmake -B ${{github.workspace}}/build -G "Ninja Multi-Config" -DCMAKE_TOOLCHAIN_FILE=${{env.ANDROID_NDK_HOME}}/build/cmake/android.toolchain.cmake -DANDROID_ABI=arm64-v8a -DANDROID_PLATFORM=23
       env:
         ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}
+
+    - name: Build
+      run: cmake --build ${{github.workspace}}/build --config ${{ matrix.config }}
+
+    - name: Package
+      working-directory: ${{github.workspace}}/build
+      run: cpack -C ${{ matrix.config }}

.github/workflows/Desktop.yml

@@ -0,0 +1,40 @@
+name: Desktop
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+env:
+  # Specifies the available build types (configurations), e.g. Debug, Release, RelWithDebInfo, MinSizeRel, etc.
+  # https://cmake.org/cmake/help/latest/variable/CMAKE_CONFIGURATION_TYPES.html
+  CMAKE_CONFIGURATION_TYPES: "Release;Debug;RelWithDebInfo;MinSizeRel"
+
+jobs:
+  build:
+    # The CMake configure and build commands are platform agnostic and should work equally well on Windows or Mac.
+    # You can convert this to a matrix build if you need cross-platform coverage.
+    # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
+    strategy:
+      matrix:
+        os: [ windows-latest, ubuntu-latest, macos-latest ]
+        config: [ Release, Debug, RelWithDebInfo, MinSizeRel ]
+    runs-on: ${{ matrix.os }}
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Configure CMake
+      run: cmake -B ${{github.workspace}}/build -G "Ninja Multi-Config"
+
+    - name: Build
+      run: cmake --build ${{github.workspace}}/build --config ${{ matrix.config }}
+
+    - name: Test
+      working-directory: ${{github.workspace}}/build
+      run: ctest --rerun-failed --output-on-failure -C ${{ matrix.config }} -T test
+
+    - name: Package
+      working-directory: ${{github.workspace}}/build
+      run: cpack -C ${{ matrix.config }}

.github/workflows/ios.yml → .github/workflows/iOS.yml

@@ -1,4 +1,4 @@
-name: CMake-iOS
+name: iOS
 
 on:
   push:
@@ -7,12 +7,15 @@ on:
     branches: [ "master" ]
 
 env:
-  # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
-  BUILD_TYPE: Release
+  # Specifies the available build types (configurations), e.g. Debug, Release, RelWithDebInfo, MinSizeRel, etc.
+  # https://cmake.org/cmake/help/latest/variable/CMAKE_CONFIGURATION_TYPES.html
+  CMAKE_CONFIGURATION_TYPES: "Release;Debug;RelWithDebInfo;MinSizeRel"
 
 jobs:
   build:
-
+    strategy:
+      matrix:
+        config: [ Release, Debug, RelWithDebInfo, MinSizeRel ]
     runs-on: macos-latest
 
     steps:
@@ -29,11 +32,11 @@ jobs:
 
 
     - name: Configure CMake
-      # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
-      # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
       run: cmake -B ${{github.workspace}}/build -G Xcode -DCMAKE_TOOLCHAIN_FILE=ios-cmake/ios.toolchain.cmake -DPLATFORM=OS64 -DBUILD_SHARED_LIBS=OFF
 
     - name: Build
-      # Build your program with the given configuration
-      run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
+      run: cmake --build ${{github.workspace}}/build --config ${{ matrix.config }}
 
+    - name: Package
+      working-directory: ${{github.workspace}}/build
+      run: cpack -C ${{ matrix.config }}