diff options
| author | phunkyfish <phunkyfish@gmail.com> | 2020-02-06 17:48:21 +0000 |
|---|---|---|
| committer | phunkyfish <phunkyfish@gmail.com> | 2020-02-27 12:51:41 +0000 |
| commit | 8810f7ecab3eedc859dd1acebc342ffea4d60b34 (patch) | |
| tree | 0dfa4f6e7d06c0c5f42a74e52974ee31dd68e9ad /cmake/scripts | |
| parent | cde760b94e57b2e07ab09dcdd25f61ca525266d2 (diff) | |
[ios] set minimum ios version to 11.0 and cleanup dependencies
Diffstat (limited to 'cmake/scripts')
| -rw-r--r-- | cmake/scripts/common/PrepareEnv.cmake | 4 | ||||
| -rw-r--r-- | cmake/scripts/darwin_embedded/ArchSetup.cmake | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/cmake/scripts/common/PrepareEnv.cmake b/cmake/scripts/common/PrepareEnv.cmake index a547d82cc1..559788f2fc 100644 --- a/cmake/scripts/common/PrepareEnv.cmake +++ b/cmake/scripts/common/PrepareEnv.cmake @@ -56,9 +56,7 @@ if(CORE_SYSTEM_NAME STREQUAL android) endif() elseif(CORE_SYSTEM_NAME STREQUAL darwin_embedded) set(PLATFORM_TAG ${CORE_PLATFORM_NAME}) - if (CPU MATCHES armv7) - set(PLATFORM_TAG ${PLATFORM_TAG}-armv7) - elseif (CPU MATCHES arm64) + if (CPU MATCHES arm64) set(PLATFORM_TAG ${PLATFORM_TAG}-aarch64) else() message(FATAL_ERROR "Unsupported architecture") diff --git a/cmake/scripts/darwin_embedded/ArchSetup.cmake b/cmake/scripts/darwin_embedded/ArchSetup.cmake index 27f403b8af..cbfe100fa1 100644 --- a/cmake/scripts/darwin_embedded/ArchSetup.cmake +++ b/cmake/scripts/darwin_embedded/ArchSetup.cmake @@ -19,9 +19,7 @@ set(CMAKE_SYSTEM_NAME Darwin) if(WITH_ARCH) set(ARCH ${WITH_ARCH}) else() - if(CPU STREQUAL armv7) - set(ARCH arm) - elseif(CPU STREQUAL arm64) + if(CPU STREQUAL arm64) set(ARCH aarch64) else() message(SEND_ERROR "Unknown CPU: ${CPU}") |