diff options
Diffstat (limited to 'cmake/scripts/ios/ArchSetup.cmake')
| -rw-r--r-- | cmake/scripts/ios/ArchSetup.cmake | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/cmake/scripts/ios/ArchSetup.cmake b/cmake/scripts/ios/ArchSetup.cmake index bec8a7c..6b053dc 100644 --- a/cmake/scripts/ios/ArchSetup.cmake +++ b/cmake/scripts/ios/ArchSetup.cmake | |||
| @@ -12,9 +12,13 @@ set(CMAKE_SYSTEM_NAME Darwin) | |||
| 12 | if(WITH_ARCH) | 12 | if(WITH_ARCH) |
| 13 | set(ARCH ${WITH_ARCH}) | 13 | set(ARCH ${WITH_ARCH}) |
| 14 | else() | 14 | else() |
| 15 | if(CPU STREQUAL armv7 OR CPU STREQUAL arm64) | 15 | if(CPU STREQUAL armv7) |
| 16 | set(CMAKE_OSX_ARCHITECTURES ${CPU}) | 16 | set(CMAKE_OSX_ARCHITECTURES ${CPU}) |
| 17 | set(ARCH arm-osx) | 17 | set(ARCH arm) |
| 18 | set(NEON True) | ||
| 19 | elseif(CPU STREQUAL arm64) | ||
| 20 | set(CMAKE_OSX_ARCHITECTURES ${CPU}) | ||
| 21 | set(ARCH aarch64) | ||
| 18 | set(NEON True) | 22 | set(NEON True) |
| 19 | else() | 23 | else() |
| 20 | message(SEND_ERROR "Unknown CPU: ${CPU}") | 24 | message(SEND_ERROR "Unknown CPU: ${CPU}") |
| @@ -36,7 +40,6 @@ list(APPEND DEPLIBS "-framework CoreFoundation" "-framework CoreVideo" | |||
| 36 | "-framework CoreMedia" "-framework AVFoundation" | 40 | "-framework CoreMedia" "-framework AVFoundation" |
| 37 | "-framework VideoToolbox") | 41 | "-framework VideoToolbox") |
| 38 | 42 | ||
| 39 | set(ENABLE_DVDCSS OFF CACHE BOOL "" FORCE) | ||
| 40 | set(ENABLE_OPTICAL OFF CACHE BOOL "" FORCE) | 43 | set(ENABLE_OPTICAL OFF CACHE BOOL "" FORCE) |
| 41 | 44 | ||
| 42 | set(CMAKE_XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET "9.0") | 45 | set(CMAKE_XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET "9.0") |
