Skip to content

Commit

Permalink
Merge branch 'feature/windows-android' into 'main'
Browse files Browse the repository at this point in the history 
Feature/windows android

See merge request asxa86/aspire!11
  • Loading branch information
@ASxa86
ASxa86 committed Nov 9, 2024
2 parents 67e80af + 48ab495 commit def9ff8
Show file tree
Hide file tree
Showing 12 changed files with 125 additions and 81 deletions.
134 changes: 82 additions & 52 deletions CMakePresets.json
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
{
"version": 6,
"include": [
"cmake/preset/config-arm64-android.json",
"cmake/preset/config-arm64-osx.json",
"cmake/preset/config-arm64-windows.json",
"cmake/preset/config-build-dir.json",
"cmake/preset/config-debug.json",
"cmake/preset/config-release.json",
"cmake/preset/config-relwithdebinfo.json",
"cmake/preset/config-x64-android.json",
"cmake/preset/config-x64-linux.json",
"cmake/preset/config-x64-windows.json",
"cmake/preset/default-build-dir.json",
"cmake/preset/default-linux.json",
"cmake/preset/default-osx.json",
"cmake/preset/default-windows.json",
"cmake/preset/host-arm64-osx.json",
"cmake/preset/host-arm64-windows.json",
"cmake/preset/host-x64-linux.json",
"cmake/preset/host-x64-windows.json",
"cmake/preset/target-arm64-android.json",
"cmake/preset/target-arm64-windows.json",
"cmake/preset/target-x64-android.json",
"cmake/preset/target-x64-linux.json",
"cmake/preset/target-x64-windows.json",
"cmake/preset/use-clang.json",
"cmake/preset/use-gcc.json",
"cmake/preset/use-msvc.json",
Expand All @@ -24,10 +24,10 @@
{
"name": "x64-windows-msvc-debug",
"inherits": [
"host-x64-windows",
"target-x64-windows",
"config-debug",
"config-x64-windows",
"default-build-dir",
"default-windows",
"config-build-dir",
"use-msvc",
"use-ninja",
"use-vcpkg"
Expand All @@ -36,10 +36,10 @@
{
"name": "x64-windows-msvc-relwithdebinfo",
"inherits": [
"host-x64-windows",
"target-x64-windows",
"config-relwithdebinfo",
"config-x64-windows",
"default-build-dir",
"default-windows",
"config-build-dir",
"use-msvc",
"use-ninja",
"use-vcpkg"
Expand All @@ -48,10 +48,10 @@
{
"name": "x64-windows-msvc-release",
"inherits": [
"host-x64-windows",
"target-x64-windows",
"config-release",
"config-x64-windows",
"default-build-dir",
"default-windows",
"config-build-dir",
"use-msvc",
"use-ninja",
"use-vcpkg"
Expand All @@ -60,10 +60,10 @@
{
"name": "arm64-windows-msvc-debug",
"inherits": [
"host-arm64-windows",
"target-arm64-windows",
"config-debug",
"config-arm64-windows",
"default-build-dir",
"default-windows",
"config-build-dir",
"use-msvc",
"use-ninja",
"use-vcpkg"
Expand All @@ -72,10 +72,10 @@
{
"name": "arm64-windows-msvc-relwithdebinfo",
"inherits": [
"host-arm64-windows",
"target-arm64-windows",
"config-relwithdebinfo",
"config-arm64-windows",
"default-build-dir",
"default-windows",
"config-build-dir",
"use-msvc",
"use-ninja",
"use-vcpkg"
Expand All @@ -84,10 +84,10 @@
{
"name": "arm64-windows-msvc-release",
"inherits": [
"host-arm64-windows",
"target-arm64-windows",
"config-release",
"config-arm64-windows",
"default-build-dir",
"default-windows",
"config-build-dir",
"use-msvc",
"use-ninja",
"use-vcpkg"
Expand All @@ -96,10 +96,9 @@
{
"name": "arm64-osx-clang-debug",
"inherits": [
"host-arm64-osx",
"config-debug",
"config-arm64-osx",
"default-build-dir",
"default-osx",
"config-build-dir",
"use-clang",
"use-ninja",
"use-vcpkg"
Expand All @@ -108,10 +107,9 @@
{
"name": "arm64-osx-clang-release",
"inherits": [
"host-arm64-osx",
"config-release",
"config-arm64-osx",
"default-build-dir",
"default-osx",
"config-build-dir",
"use-clang",
"use-ninja",
"use-vcpkg"
Expand All @@ -120,10 +118,10 @@
{
"name": "x64-linux-gcc-debug",
"inherits": [
"host-x64-linux",
"target-x64-linux",
"config-debug",
"config-x64-linux",
"default-build-dir",
"default-linux",
"config-build-dir",
"use-gcc",
"use-ninja",
"use-vcpkg"
Expand All @@ -132,10 +130,10 @@
{
"name": "x64-linux-gcc-release",
"inherits": [
"host-x64-linux",
"target-x64-linux",
"config-release",
"config-x64-linux",
"default-build-dir",
"default-linux",
"config-build-dir",
"use-gcc",
"use-ninja",
"use-vcpkg"
Expand All @@ -144,10 +142,10 @@
{
"name": "x64-android-debug",
"inherits": [
"host-x64-linux",
"target-x64-android",
"config-debug",
"config-x64-android",
"default-build-dir",
"default-linux",
"config-build-dir",
"use-gcc",
"use-ninja",
"use-vcpkg"
Expand All @@ -156,10 +154,10 @@
{
"name": "x64-android-release",
"inherits": [
"host-x64-linux",
"target-x64-android",
"config-release",
"config-x64-android",
"default-build-dir",
"default-linux",
"config-build-dir",
"use-gcc",
"use-ninja",
"use-vcpkg"
Expand All @@ -168,10 +166,10 @@
{
"name": "arm64-android-debug",
"inherits": [
"host-x64-linux",
"target-arm64-android",
"config-debug",
"config-arm64-android",
"default-build-dir",
"default-linux",
"config-build-dir",
"use-gcc",
"use-ninja",
"use-vcpkg"
Expand All @@ -180,14 +178,38 @@
{
"name": "arm64-android-release",
"inherits": [
"host-x64-linux",
"target-arm64-android",
"config-release",
"config-arm64-android",
"default-build-dir",
"default-linux",
"config-build-dir",
"use-gcc",
"use-ninja",
"use-vcpkg"
]
},
{
"name": "arm64-android-x64-windows-debug",
"inherits": [
"host-x64-windows",
"target-arm64-android",
"config-debug",
"config-build-dir",
"use-msvc",
"use-ninja",
"use-vcpkg"
]
},
{
"name": "arm64-android-x64-windows-release",
"inherits": [
"host-x64-windows",
"target-arm64-android",
"config-release",
"config-build-dir",
"use-msvc",
"use-ninja",
"use-vcpkg"
]
}
],
"buildPresets": [
Expand Down Expand Up @@ -246,6 +268,14 @@
{
"name": "arm64-android-release",
"configurePreset": "arm64-android-release"
},
{
"name": "arm64-android-x64-windows-debug",
"configurePreset": "arm64-android-x64-windows-debug"
},
{
"name": "arm64-android-x64-windows-release",
"configurePreset": "arm64-android-x64-windows-release"
}
]
}
2 changes: 1 addition & 1 deletion cmake/preset/default-build-dir.json → cmake/preset/config-build-dir.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"version": 6,
"configurePresets": [
{
"name": "default-build-dir",
"name": "config-build-dir",
"hidden": true,
"binaryDir": "${sourceDir}/build"
}
Expand Down
13 changes: 0 additions & 13 deletions cmake/preset/default-osx.json
View file

This file was deleted.

7 changes: 6 additions & 1 deletion cmake/preset/config-arm64-osx.json → cmake/preset/host-arm64-osx.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,13 @@
"version": 6,
"configurePresets": [
{
"name": "config-arm64-osx",
"name": "host-arm64-osx",
"hidden": true,
"condition": {
"type": "equals",
"lhs": "${hostSystemName}",
"rhs": "Darwin"
},
"cacheVariables": {
"VCPKG_HOST_TRIPLET": "arm64-osx-release",
"VCPKG_TARGET_TRIPLET": "arm64-osx-release"
Expand Down
17 changes: 17 additions & 0 deletions cmake/preset/host-arm64-windows.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"version": 6,
"configurePresets": [
{
"name": "host-arm64-windows",
"hidden": true,
"condition": {
"type": "equals",
"lhs": "${hostSystemName}",
"rhs": "Windows"
},
"cacheVariables": {
"VCPKG_HOST_TRIPLET": "arm64-windows-aspire"
}
}
]
}
5 changes: 4 additions & 1 deletion cmake/preset/default-linux.json → cmake/preset/host-x64-linux.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,15 @@
"version": 6,
"configurePresets": [
{
"name": "default-linux",
"name": "host-x64-linux",
"hidden": true,
"condition": {
"type": "equals",
"lhs": "${hostSystemName}",
"rhs": "Linux"
},
"cacheVariables": {
"VCPKG_HOST_TRIPLET": "x64-linux-aspire"
}
}
]
Expand Down
5 changes: 4 additions & 1 deletion cmake/preset/default-windows.json → cmake/preset/host-x64-windows.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,15 @@
"version": 6,
"configurePresets": [
{
"name": "default-windows",
"name": "host-x64-windows",
"hidden": true,
"condition": {
"type": "equals",
"lhs": "${hostSystemName}",
"rhs": "Windows"
},
"cacheVariables": {
"VCPKG_HOST_TRIPLET": "x64-windows-aspire"
}
}
]
Expand Down
7 changes: 4 additions & 3 deletions cmake/preset/config-arm64-android.json → cmake/preset/target-arm64-android.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,19 @@
"version": 6,
"configurePresets": [
{
"name": "config-arm64-android",
"name": "target-arm64-android",
"hidden": true,
"cacheVariables": {
"VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/vcpkg/scripts/toolchains/android.cmake",
"VCPKG_HOST_TRIPLET": "x64-linux-aspire",
"VCPKG_TARGET_TRIPLET": "arm64-android-aspire",
"VCPKG_INSTALL_OPTIONS": "--allow-unsupported",
"VCPKG_KEEP_ENV_VARS": "ANDROID_HOME;ANDROID_NDK_HOME",
"ANDROID_STL": "c++_shared",
"ANDROID_SDK_ROOT": "$env{ANDROID_HOME}",
"ANDROID_PLATFORM": "34",
"ANDROID_ABI": "arm64-v8a"
},
"environment": {
"VCPKG_KEEP_ENV_VARS": "ANDROID_HOME;ANDROID_NDK_HOME;JAVA_HOME"
}
}
]
Expand Down
3 changes: 1 addition & 2 deletions cmake/preset/config-arm64-windows.json → cmake/preset/target-arm64-windows.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,9 @@
"version": 6,
"configurePresets": [
{
"name": "config-arm64-windows",
"name": "target-arm64-windows",
"hidden": true,
"cacheVariables": {
"VCPKG_HOST_TRIPLET": "arm64-windows-aspire",
"VCPKG_TARGET_TRIPLET": "arm64-windows-aspire"
}
}
Expand Down
Loading

0 comments on commit def9ff8

Please sign in to comment.