Work on CI builds

emericg · Nov 11, 2024 · 107f2bb · 107f2bb
1 parent 9d6622e
commit 107f2bb
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/.github/workflows/builds_desktop_cmake.yml b/.github/workflows/builds_desktop_cmake.yml
@@ -54,7 +54,7 @@ jobs:
       # Build application
       - name: Build application
         run: |
-             cmake -B build/ -DCMAKE_BUILD_TYPE=Release G Ninja
+             cmake -B build/ -DCMAKE_BUILD_TYPE=Release -G Ninja
              cmake --build build/ --config Release
 
       # Deploy application

diff --git a/.github/workflows/builds_mobile_cmake.yml b/.github/workflows/builds_mobile_cmake.yml
@@ -144,7 +144,7 @@ jobs:
                -DCMAKE_PREFIX_PATH:PATH=${{env.QT_TARGET_PATH}} \
                -DANDROID_SDK_ROOT=$ANDROID_SDK_ROOT \
                -DANDROID_NDK_ROOT=$ANDROID_NDK_ROOT \
-               -DANDROID_PLATFORM=android-23 \
+               -DANDROID_PLATFORM=android-28 \
                -DANDROID_ABI="arm64-v8a" \
                -DQT_HOST_PATH:PATH=${{env.QT_HOST_PATH}} \
                -DQT_ANDROID_BUILD_ALL_ABIS=ON \
@@ -261,7 +261,6 @@ jobs:
                -DCMAKE_BUILD_TYPE=Release \
                -DCMAKE_FIND_ROOT_PATH:PATH=${{env.QT_TARGET_PATH}} \
                -DCMAKE_PREFIX_PATH:PATH=${{env.QT_TARGET_PATH}} \
-               -DCMAKE_TOOLCHAIN_FILE=assets/ios/ios.toolchain.cmake \
                -DQT_HOST_PATH:PATH=${{env.QT_HOST_PATH}} \
                -DENABLE_ARC=FALSE \
                -DPLATFORM=OS64 \

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -195,14 +195,14 @@ if (CMAKE_SYSTEM_NAME STREQUAL "iOS")
         XCODE_ATTRIBUTE_PRODUCT_NAME                        ${CMAKE_PROJECT_NAME}
         XCODE_ATTRIBUTE_CURRENT_PROJECT_VERSION             ${CMAKE_PROJECT_VERSION}
         XCODE_ATTRIBUTE_MARKETING_VERSION                   ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
-        XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET          "16.0"
+        XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET          "14.0"
         XCODE_ATTRIBUTE_TARGETED_DEVICE_FAMILY              "1,2"   # iPhone,iPad
         XCODE_ATTRIBUTE_ASSETCATALOG_COMPILER_APPICON_NAME  "AppIcon"
     )
 endif()
 
 ## Windows
-if (WIN32)
+if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
     set_target_properties(${CMAKE_PROJECT_NAME} PROPERTIES
         WIN32_EXECUTABLE ON
     )