more trying

Author: enetheru

.github/actions/setup-godot-cpp/action.yml

@@ -22,10 +22,13 @@ inputs:
   ndk-version:
     default: r23c
     description: Android NDK version.
+  buildtool:
+    description: scons or cmake
   scons-version:
     default: 4.4.0
     description: SCons version.
 
+
 runs:
   using: composite
   steps:
@@ -55,8 +58,13 @@ runs:
         version: ${{ inputs.mingw-version }}
 
     - name: Setup SCons
+      if: ${{ inputs.buildtool == 'scons' }}
       shell: bash
       run: |
         python -c "import sys; print(sys.version)"
         python -m pip install scons==${{ inputs.scons-version }}
         scons --version
+
+    - name: Install Ninja
+      if: ${{ inputs.buildtool == 'cmake' }}
+      uses: ashutoshvarma/setup-ninja@master

.github/workflows/ci-cmake.yml

@@ -21,22 +21,26 @@ jobs:
     runs-on: ${{ matrix.os }}
     env:
       EM_VERSION: 3.1.39
-      config-flags:  -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DGODOTCPP_ENABLE_TESTING=ON -DGODOTCPP_BUILD_PROFILE="test/build_profile.json"
+      config-flags:
+        -DCMAKE_C_COMPILER_LAUNCHER=sccache
+        -DCMAKE_CXX_COMPILER_LAUNCHER=sccache
+        -DGODOTCPP_ENABLE_TESTING=ON
+        -DGODOTCPP_BUILD_PROFILE="test/build_profile.json"
       SCCACHE_GHA_ENABLED: "true"
 
     strategy:
       fail-fast: false
       matrix:
         include:
-          - name: 🐧 Linux (GCC)
+          - name: 🐧 Linux (GCC, Makefiles)
             os: ubuntu-22.04
             platform: linux
             config-flags: -DCMAKE_BUILD_TYPE=Release
             artifact-name: godot-cpp-linux-glibc2.27-x86_64-release.cmake
             artifact-path: cmake-build/bin/libgodot-cpp.linux.template_release.x86_64.a
             run-tests: true
 
-          - name: 🐧 Linux (GCC, Double Precision)
+          - name: 🐧 Linux (GCC, Makefiles, Double Precision)
             os: ubuntu-22.04
             platform: linux
             config-flags: -DCMAKE_BUILD_TYPE=Release -DGODOTCPP_PRECISION=double
@@ -54,7 +58,7 @@ jobs:
             artifact-path: cmake-build/bin/libgodot-cpp.windows.template_release.x86_64.lib
             run-tests: false
 
-          - name: 🏁 Windows (x86_64, MinGW)
+          - name: 🏁 Windows (x86_64, MinGW, Ninja)
             os: windows-2019
             platform: windows
             compiler: mingw
@@ -74,7 +78,10 @@ jobs:
           - name: 🤖 Android (arm64)
             os: ubuntu-22.04
             platform: android
-            config-flags:  -G Ninja -DCMAKE_BUILD_TYPE=Release --toolchain ${ANDROID_HOME}/ndk/23.2.8568313/build/cmake/android.toolchain.cmake -DANDROID_PLATFORM=21
+            config-flags:
+              -G Ninja -DCMAKE_BUILD_TYPE=Release
+              --toolchain ${ANDROID_HOME}/ndk/23.2.8568313/build/cmake/android.toolchain.cmake
+              -DANDROID_PLATFORM=21 -DANDROID_ABI=arm64-v8a
             artifact-name: godot-cpp-android-arm64-release.cmake
             artifact-path: cmake-build/bin/libgodot-cpp.android.template_release.arm64.a
             flags: arch=arm64
@@ -89,12 +96,12 @@ jobs:
             flags: arch=arm64
             run-tests: false
 
-
-
           - name: 🌐 Web (wasm32)
             os: ubuntu-22.04
             platform: web
-            config-flags: -G Ninja  -DCMAKE_BUILD_TYPE=Release --toolchain ${EMSDK}/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake
+            config-flags:
+              -G Ninja  -DCMAKE_BUILD_TYPE=Release
+              --toolchain ${EMSDK}/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake
             artifact-name: godot-cpp-web-wasm32-release.cmake
             artifact-path: cmake-build/bin/libgodot-cpp.web.template_release.wasm32.a
             run-tests: false
@@ -113,18 +120,19 @@ jobs:
         with:
           platform: ${{ matrix.platform }}
           windows-compiler: ${{ matrix.compiler }}
+          buildtool: cmake
 
       - name: Configure
-        run: |
+        run: >
           cmake --log-level=VERBOSE -S . -B cmake-build ${{ env.config-flags }} ${{ matrix.config-flags }}
 
       - name: Build test.template_debug
-        run: |
-          cmake --build cmake-build --target godot-cpp.test.template_debug ${{ matrix.build-flags }}
+        run: >
+          cmake --build cmake-build --verbose  --target godot-cpp.test.template_debug ${{ matrix.build-flags }}
 
       - name: Build test.template_release
-        run: |
-          cmake --build cmake-build --target godot-cpp.test.template_release ${{ matrix.build-flags }}
+        run: >
+          cmake --build cmake-build --verbose  --target godot-cpp.test.template_release ${{ matrix.build-flags }}
 
       - name: Run sccache stat for check
         shell: bash

.github/workflows/ci-scons.yml

@@ -113,6 +113,7 @@ jobs:
         with:
           platform: ${{ matrix.platform }}
           windows-compiler: ${{ contains(matrix.flags, 'use_mingw=yes') && 'mingw' || 'msvc' }}
+          buildtool: scons
 
       - name: Generate godot-cpp sources only
         run: |
@@ -131,7 +132,7 @@ jobs:
       - name: Build test and godot-cpp (release)
         run: |
           cd test
-          scons platform=${{ matrix.platform }} verbose=yes target=template_release ${{ matrix.flags }} build_profile="build_profile.json"
+          scons platform=${{ matrix.platform }} verbose=yes target=template_release ${{ matrix.flags }}
 
       - name: Save Godot build cache
         uses: ./.github/actions/godot-cache-save

cmake/godotcpp.cmake

@@ -258,7 +258,7 @@ function( godotcpp_generate )
     ### Platform is derived from the toolchain target
     # See GeneratorExpressions PLATFORM_ID and CMAKE_SYSTEM_NAME
     string( CONCAT SYSTEM_NAME
-            "$<$<PLATFORM_ID:Android>:android.${ANDROID_ABI}>"
+            "$<$<PLATFORM_ID:Android>:android>"
             "$<$<PLATFORM_ID:iOS>:ios>"
             "$<$<PLATFORM_ID:Linux>:linux>"
             "$<$<PLATFORM_ID:Darwin>:macos>"