diff options
Diffstat (limited to 'protocols/Telegram/tdlib/td/CMake')
| -rw-r--r-- | protocols/Telegram/tdlib/td/CMake/GetGitRevisionDescription.cmake | 2 | ||||
| -rw-r--r-- | protocols/Telegram/tdlib/td/CMake/iOS.cmake | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/protocols/Telegram/tdlib/td/CMake/GetGitRevisionDescription.cmake b/protocols/Telegram/tdlib/td/CMake/GetGitRevisionDescription.cmake index b565582098..420772966c 100644 --- a/protocols/Telegram/tdlib/td/CMake/GetGitRevisionDescription.cmake +++ b/protocols/Telegram/tdlib/td/CMake/GetGitRevisionDescription.cmake @@ -80,7 +80,7 @@ function(get_git_head_revision _refspecvar _hashvar) # The following git command will return a non empty string that # points to the super project working tree if the current # source dir is inside a git submodule. - # Otherwise the command will return an empty string. + # Otherwise, the command will return an empty string. # execute_process( COMMAND "${GIT_EXECUTABLE}" rev-parse --show-superproject-working-tree diff --git a/protocols/Telegram/tdlib/td/CMake/iOS.cmake b/protocols/Telegram/tdlib/td/CMake/iOS.cmake index 9351395422..55e3f42c18 100644 --- a/protocols/Telegram/tdlib/td/CMake/iOS.cmake +++ b/protocols/Telegram/tdlib/td/CMake/iOS.cmake @@ -65,7 +65,7 @@ set (IOS_PLATFORM ${IOS_PLATFORM} CACHE STRING "Type of iOS Platform") # Check the platform selection and setup for developer root if (IOS_PLATFORM STREQUAL "OS") set (IOS_PLATFORM_LOCATION "iPhoneOS.platform") - set (XCODE_IOS_PLATFORM iphoneos) + set (XCODE_IOS_PLATFORM ios) # This causes the installers to properly locate the output libraries set (CMAKE_XCODE_EFFECTIVE_PLATFORMS "-iphoneos") @@ -74,7 +74,7 @@ if (IOS_PLATFORM STREQUAL "OS") elseif (IOS_PLATFORM STREQUAL "SIMULATOR") set (SIMULATOR_FLAG true) set (IOS_PLATFORM_LOCATION "iPhoneSimulator.platform") - set (XCODE_IOS_PLATFORM iphonesimulator) + set (XCODE_IOS_PLATFORM ios-simulator) # This causes the installers to properly locate the output libraries set (CMAKE_XCODE_EFFECTIVE_PLATFORMS "-iphonesimulator") @@ -91,7 +91,7 @@ elseif (IOS_PLATFORM STREQUAL "WATCHOS") elseif (IOS_PLATFORM STREQUAL "WATCHSIMULATOR") set (SIMULATOR_FLAG true) set (IOS_PLATFORM_LOCATION "WatchSimulator.platform") - set (XCODE_IOS_PLATFORM watchsimulator) + set (XCODE_IOS_PLATFORM watchos-simulator) # This causes the installers to properly locate the output libraries set (CMAKE_XCODE_EFFECTIVE_PLATFORMS "-watchsimulator") @@ -108,7 +108,7 @@ elseif (IOS_PLATFORM STREQUAL "TVOS") elseif (IOS_PLATFORM STREQUAL "TVSIMULATOR") set (SIMULATOR_FLAG true) set (IOS_PLATFORM_LOCATION "AppleTvSimulator.platform") - set (XCODE_IOS_PLATFORM tvsimulator) + set (XCODE_IOS_PLATFORM tvos-simulator) # This causes the installers to properly locate the output libraries set (CMAKE_XCODE_EFFECTIVE_PLATFORMS "-tvsimulator") @@ -199,7 +199,7 @@ if (NOT DEFINED IOS_ARCH) elseif (IOS_PLATFORM STREQUAL "SIMULATOR") set (IOS_ARCH "i386;x86_64;arm64") elseif (IOS_PLATFORM STREQUAL "WATCHOS") - set (IOS_ARCH "armv7k;arm64_32") + set (IOS_ARCH "armv7k;arm64_32;arm64") elseif (IOS_PLATFORM STREQUAL "WATCHSIMULATOR") set (IOS_ARCH "i386;x86_64;arm64") elseif (IOS_PLATFORM STREQUAL "TVOS") |