mirror of https://github.com/microsoft/vcpkg.git
Add support for tvOS and watchOS platforms (#47024)
This commit is contained in:
Waldemar Kornewald
GitHub
parent
d20d763cc2
commit
53c13a7853
|
|
@ -352,6 +352,10 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin" OR (NOT CMAKE_SYSTEM_NAME AND CMAKE_H
|
|||
set(Z_VCPKG_TARGET_TRIPLET_PLAT osx)
|
||||
elseif(CMAKE_SYSTEM_NAME STREQUAL "iOS")
|
||||
set(Z_VCPKG_TARGET_TRIPLET_PLAT ios)
|
||||
elseif(CMAKE_SYSTEM_NAME STREQUAL "watchOS")
|
||||
set(Z_VCPKG_TARGET_TRIPLET_PLAT watchos)
|
||||
elseif(CMAKE_SYSTEM_NAME STREQUAL "tvOS")
|
||||
set(Z_VCPKG_TARGET_TRIPLET_PLAT tvos)
|
||||
elseif(CMAKE_SYSTEM_NAME STREQUAL "visionOS")
|
||||
set(Z_VCPKG_TARGET_TRIPLET_PLAT visionos)
|
||||
elseif(MINGW)
|
||||
|
|
@ -826,7 +830,7 @@ macro("${VCPKG_OVERRIDE_FIND_PACKAGE_NAME}" z_vcpkg_find_package_package_name)
|
|||
# the ROOT_PATH at apple OS initialization phase.
|
||||
# See https://gitlab.kitware.com/cmake/cmake/merge_requests/3273
|
||||
# Fixed in CMake 3.15
|
||||
if(CMAKE_SYSTEM_NAME STREQUAL "iOS" OR CMAKE_SYSTEM_NAME STREQUAL "visionOS")
|
||||
if(CMAKE_SYSTEM_NAME STREQUAL "iOS" OR CMAKE_SYSTEM_NAME STREQUAL "watchOS" OR CMAKE_SYSTEM_NAME STREQUAL "tvOS" OR CMAKE_SYSTEM_NAME STREQUAL "visionOS")
|
||||
list(APPEND z_vcpkg_find_package_${z_vcpkg_find_package_backup_id}_backup_vars "CMAKE_FIND_ROOT_PATH")
|
||||
if(DEFINED CMAKE_FIND_ROOT_PATH)
|
||||
set(z_vcpkg_find_package_${z_vcpkg_find_package_backup_id}_backup_CMAKE_FIND_ROOT_PATH "${CMAKE_FIND_ROOT_PATH}")
|
||||
|
|
|
|||
|
|
@ -13,6 +13,10 @@ elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin")
|
|||
set(VCPKG_TARGET_IS_OSX ON)
|
||||
elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "iOS")
|
||||
set(VCPKG_TARGET_IS_IOS ON)
|
||||
elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "watchOS")
|
||||
set(VCPKG_TARGET_IS_WATCHOS ON)
|
||||
elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "tvOS")
|
||||
set(VCPKG_TARGET_IS_TVOS ON)
|
||||
elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "visionOS")
|
||||
set(VCPKG_TARGET_IS_VISIONOS ON)
|
||||
elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux")
|
||||
|
|
@ -85,7 +89,7 @@ else()
|
|||
set(VCPKG_HOST_BUNDLE_SUFFIX "")
|
||||
endif()
|
||||
|
||||
if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_IOS OR VCPKG_TARGET_IS_VISIONOS)
|
||||
if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_IOS OR VCPKG_TARGET_IS_WATCHOS OR VCPKG_TARGET_IS_TVOS OR VCPKG_TARGET_IS_VISIONOS)
|
||||
set(VCPKG_TARGET_BUNDLE_SUFFIX ".app")
|
||||
else()
|
||||
set(VCPKG_TARGET_BUNDLE_SUFFIX "")
|
||||
|
|
@ -111,7 +115,7 @@ elseif(VCPKG_TARGET_IS_WINDOWS)
|
|||
set(VCPKG_TARGET_IMPORT_LIBRARY_PREFIX "")
|
||||
set(VCPKG_FIND_LIBRARY_SUFFIXES ".lib" ".dll") #This is a slight modification to CMakes value which does not include ".dll".
|
||||
set(VCPKG_FIND_LIBRARY_PREFIXES "" "lib") #This is a slight modification to CMakes value which does not include "lib".
|
||||
elseif(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_IOS OR VCPKG_TARGET_IS_VISIONOS)
|
||||
elseif(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_IOS OR VCPKG_TARGET_IS_WATCHOS OR VCPKG_TARGET_IS_TVOS OR VCPKG_TARGET_IS_VISIONOS)
|
||||
set(VCPKG_TARGET_STATIC_LIBRARY_SUFFIX ".a")
|
||||
set(VCPKG_TARGET_IMPORT_LIBRARY_SUFFIX "")
|
||||
set(VCPKG_TARGET_SHARED_LIBRARY_SUFFIX ".dylib")
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ function(z_vcpkg_get_visual_studio_generator)
|
|||
endfunction()
|
||||
|
||||
function(z_vcpkg_select_default_vcpkg_chainload_toolchain)
|
||||
# Try avoiding adding more defaults here.
|
||||
# Try avoiding adding more defaults here.
|
||||
# Set VCPKG_CHAINLOAD_TOOLCHAIN_FILE explicitly in the triplet.
|
||||
if(DEFINED Z_VCPKG_CHAINLOAD_TOOLCHAIN_FILE)
|
||||
set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${Z_VCPKG_CHAINLOAD_TOOLCHAIN_FILE}")
|
||||
|
|
@ -75,6 +75,10 @@ function(z_vcpkg_select_default_vcpkg_chainload_toolchain)
|
|||
set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/osx.cmake")
|
||||
elseif(VCPKG_TARGET_IS_IOS)
|
||||
set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/ios.cmake")
|
||||
elseif(VCPKG_TARGET_IS_WATCHOS)
|
||||
set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/ios.cmake")
|
||||
elseif(VCPKG_TARGET_IS_TVOS)
|
||||
set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/ios.cmake")
|
||||
elseif(VCPKG_TARGET_IS_VISIONOS)
|
||||
set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/ios.cmake")
|
||||
elseif(VCPKG_TARGET_IS_FREEBSD)
|
||||
|
|
@ -275,13 +279,13 @@ function(vcpkg_configure_cmake)
|
|||
endif()
|
||||
|
||||
vcpkg_list(SET rel_command
|
||||
"${CMAKE_COMMAND}" "${arg_SOURCE_PATH}"
|
||||
"${CMAKE_COMMAND}" "${arg_SOURCE_PATH}"
|
||||
-G "${generator}"
|
||||
"-DCMAKE_BUILD_TYPE=Release"
|
||||
"-DCMAKE_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}"
|
||||
${arg_OPTIONS} ${arg_OPTIONS_RELEASE})
|
||||
vcpkg_list(SET dbg_command
|
||||
"${CMAKE_COMMAND}" "${arg_SOURCE_PATH}"
|
||||
"${CMAKE_COMMAND}" "${arg_SOURCE_PATH}"
|
||||
-G "${generator}"
|
||||
"-DCMAKE_BUILD_TYPE=Debug"
|
||||
"-DCMAKE_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}/debug"
|
||||
|
|
@ -323,7 +327,7 @@ function(vcpkg_configure_cmake)
|
|||
"../../${TARGET_TRIPLET}-dbg/CMakeCache.txt" ALIAS "dbg-CMakeCache.txt.log"
|
||||
"../CMakeCache.txt" ALIAS "rel-CMakeCache.txt.log"
|
||||
)
|
||||
|
||||
|
||||
vcpkg_list(APPEND config_logs
|
||||
"${CURRENT_BUILDTREES_DIR}/${arg_LOGNAME}-out.log"
|
||||
"${CURRENT_BUILDTREES_DIR}/${arg_LOGNAME}-err.log")
|
||||
|
|
@ -356,7 +360,7 @@ function(vcpkg_configure_cmake)
|
|||
"${CURRENT_BUILDTREES_DIR}/${arg_LOGNAME}-rel-err.log")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
|
||||
# Check unused variables
|
||||
vcpkg_list(SET all_unused_variables)
|
||||
foreach(config_log IN LISTS config_logs)
|
||||
|
|
|
|||
|
|
@ -294,13 +294,13 @@ function(vcpkg_configure_make)
|
|||
endif()
|
||||
|
||||
# Backup environment variables
|
||||
# CCAS CC C CPP CXX FC FF GC LD LF LIBTOOL OBJC OBJCXX R UPC Y
|
||||
# CCAS CC C CPP CXX FC FF GC LD LF LIBTOOL OBJC OBJCXX R UPC Y
|
||||
set(cm_FLAGS AR AS CCAS CC C CPP CXX FC FF GC LD LF LIBTOOL OBJC OBJXX R UPC Y RC)
|
||||
list(TRANSFORM cm_FLAGS APPEND "FLAGS")
|
||||
vcpkg_backup_env_variables(VARS ${cm_FLAGS})
|
||||
|
||||
|
||||
# FC fotran compiler | FF Fortran 77 compiler
|
||||
# FC fotran compiler | FF Fortran 77 compiler
|
||||
# LDFLAGS -> pass -L flags
|
||||
# LIBS -> pass -l flags
|
||||
|
||||
|
|
@ -343,7 +343,7 @@ function(vcpkg_configure_make)
|
|||
|
||||
message(DEBUG "path_list:${path_list}") # Just to have --trace-expand output
|
||||
|
||||
vcpkg_list(SET find_system_dirs
|
||||
vcpkg_list(SET find_system_dirs
|
||||
"${system_root}/System32"
|
||||
"${system_root}/System32/"
|
||||
"${local_app_data}/Microsoft/WindowsApps"
|
||||
|
|
@ -375,7 +375,7 @@ function(vcpkg_configure_make)
|
|||
endif()
|
||||
|
||||
# macOS - cross-compiling support
|
||||
if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_IOS OR VCPKG_TARGET_IS_VISIONOS)
|
||||
if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_IOS OR VCPKG_TARGET_IS_WATCHOS OR VCPKG_TARGET_IS_TVOS OR VCPKG_TARGET_IS_VISIONOS)
|
||||
if (requires_autoconfig AND NOT arg_BUILD_TRIPLET OR arg_DETERMINE_BUILD_TRIPLET)
|
||||
z_vcpkg_determine_autotools_host_arch_mac(BUILD_ARCH) # machine you are building on => --build=
|
||||
z_vcpkg_determine_autotools_target_arch_mac(TARGET_ARCH)
|
||||
|
|
@ -394,10 +394,10 @@ function(vcpkg_configure_make)
|
|||
# Linux - cross-compiling support
|
||||
if(VCPKG_TARGET_IS_LINUX)
|
||||
if (requires_autoconfig AND NOT arg_BUILD_TRIPLET OR arg_DETERMINE_BUILD_TRIPLET)
|
||||
# The regex below takes the prefix from the resulting CMAKE_C_COMPILER variable eg. arm-linux-gnueabihf-gcc
|
||||
# The regex below takes the prefix from the resulting CMAKE_C_COMPILER variable eg. arm-linux-gnueabihf-gcc
|
||||
# set in the common toolchains/linux.cmake
|
||||
# This is used via --host as a prefix for all other bin tools as well.
|
||||
# Setting the compiler directly via CC=arm-linux-gnueabihf-gcc does not work acording to:
|
||||
# This is used via --host as a prefix for all other bin tools as well.
|
||||
# Setting the compiler directly via CC=arm-linux-gnueabihf-gcc does not work acording to:
|
||||
# https://www.gnu.org/software/autoconf/manual/autoconf-2.65/html_node/Specifying-Target-Triplets.html
|
||||
if(VCPKG_DETECTED_CMAKE_C_COMPILER MATCHES "([^\/]*)-gcc$" AND CMAKE_MATCH_1)
|
||||
set(arg_BUILD_TRIPLET "--host=${CMAKE_MATCH_1}") # (Host activates crosscompilation; The name given here is just the prefix of the host tools for the target)
|
||||
|
|
@ -462,7 +462,7 @@ function(vcpkg_configure_make)
|
|||
z_vcpkg_append_to_configure_environment(configure_env CPP_FOR_BUILD "compile ${VCPKG_DETECTED_CMAKE_C_COMPILER} -E")
|
||||
z_vcpkg_append_to_configure_environment(configure_env CXX_FOR_BUILD "compile ${VCPKG_DETECTED_CMAKE_CXX_COMPILER}")
|
||||
else()
|
||||
# Silly trick to make configure accept CC_FOR_BUILD but in reallity CC_FOR_BUILD is deactivated.
|
||||
# Silly trick to make configure accept CC_FOR_BUILD but in reallity CC_FOR_BUILD is deactivated.
|
||||
z_vcpkg_append_to_configure_environment(configure_env CC_FOR_BUILD "touch a.out | touch conftest${VCPKG_HOST_EXECUTABLE_SUFFIX} | true")
|
||||
z_vcpkg_append_to_configure_environment(configure_env CPP_FOR_BUILD "touch a.out | touch conftest${VCPKG_HOST_EXECUTABLE_SUFFIX} | true")
|
||||
z_vcpkg_append_to_configure_environment(configure_env CXX_FOR_BUILD "touch a.out | touch conftest${VCPKG_HOST_EXECUTABLE_SUFFIX} | true")
|
||||
|
|
@ -506,20 +506,20 @@ function(vcpkg_configure_make)
|
|||
z_vcpkg_append_to_configure_environment(configure_env OBJDUMP "${VCPKG_DETECTED_CMAKE_OBJDUMP}") # Trick to ignore the RANLIB call
|
||||
endif()
|
||||
if(VCPKG_DETECTED_CMAKE_STRIP) # If required set the ENV variable STRIP in the portfile correctly
|
||||
z_vcpkg_append_to_configure_environment(configure_env STRIP "${VCPKG_DETECTED_CMAKE_STRIP}")
|
||||
z_vcpkg_append_to_configure_environment(configure_env STRIP "${VCPKG_DETECTED_CMAKE_STRIP}")
|
||||
else()
|
||||
z_vcpkg_append_to_configure_environment(configure_env STRIP ":")
|
||||
list(APPEND arg_OPTIONS ac_cv_prog_ac_ct_STRIP=:)
|
||||
endif()
|
||||
if(VCPKG_DETECTED_CMAKE_NM) # If required set the ENV variable NM in the portfile correctly
|
||||
z_vcpkg_append_to_configure_environment(configure_env NM "${VCPKG_DETECTED_CMAKE_NM}")
|
||||
z_vcpkg_append_to_configure_environment(configure_env NM "${VCPKG_DETECTED_CMAKE_NM}")
|
||||
else()
|
||||
# Would be better to have a true nm here! Some symbols (mainly exported variables) get not properly imported with dumpbin as nm
|
||||
# Would be better to have a true nm here! Some symbols (mainly exported variables) get not properly imported with dumpbin as nm
|
||||
# and require __declspec(dllimport) for some reason (same problem CMake has with WINDOWS_EXPORT_ALL_SYMBOLS)
|
||||
z_vcpkg_append_to_configure_environment(configure_env NM "dumpbin.exe -symbols -headers")
|
||||
endif()
|
||||
if(VCPKG_DETECTED_CMAKE_DLLTOOL) # If required set the ENV variable DLLTOOL in the portfile correctly
|
||||
z_vcpkg_append_to_configure_environment(configure_env DLLTOOL "${VCPKG_DETECTED_CMAKE_DLLTOOL}")
|
||||
z_vcpkg_append_to_configure_environment(configure_env DLLTOOL "${VCPKG_DETECTED_CMAKE_DLLTOOL}")
|
||||
else()
|
||||
z_vcpkg_append_to_configure_environment(configure_env DLLTOOL "link.exe -verbose -dll")
|
||||
endif()
|
||||
|
|
@ -531,15 +531,15 @@ function(vcpkg_configure_make)
|
|||
endforeach()
|
||||
debug_message("configure_env: '${configure_env}'")
|
||||
# Other maybe interesting variables to control
|
||||
# COMPILE This is the command used to actually compile a C source file. The file name is appended to form the complete command line.
|
||||
# COMPILE This is the command used to actually compile a C source file. The file name is appended to form the complete command line.
|
||||
# LINK This is the command used to actually link a C program.
|
||||
# CXXCOMPILE The command used to actually compile a C++ source file. The file name is appended to form the complete command line.
|
||||
# CXXLINK The command used to actually link a C++ program.
|
||||
# CXXCOMPILE The command used to actually compile a C++ source file. The file name is appended to form the complete command line.
|
||||
# CXXLINK The command used to actually link a C++ program.
|
||||
|
||||
# Variables not correctly detected by configure. In release builds.
|
||||
list(APPEND arg_OPTIONS gl_cv_double_slash_root=yes
|
||||
ac_cv_func_memmove=yes)
|
||||
#list(APPEND arg_OPTIONS lt_cv_deplibs_check_method=pass_all) # Just ignore libtool checks
|
||||
#list(APPEND arg_OPTIONS lt_cv_deplibs_check_method=pass_all) # Just ignore libtool checks
|
||||
if(VCPKG_TARGET_ARCHITECTURE MATCHES "^[Aa][Rr][Mm]64$")
|
||||
list(APPEND arg_OPTIONS gl_cv_host_cpu_c_abi=no)
|
||||
# Currently needed for arm64 because objdump yields: "unrecognised machine type (0xaa64) in Import Library Format archive"
|
||||
|
|
@ -648,7 +648,7 @@ function(vcpkg_configure_make)
|
|||
|
||||
file(RELATIVE_PATH relative_build_path "${CURRENT_BUILDTREES_DIR}" "${arg_SOURCE_PATH}/${arg_PROJECT_SUBPATH}")
|
||||
|
||||
# Used by CL
|
||||
# Used by CL
|
||||
vcpkg_host_path_list(PREPEND ENV{INCLUDE} "${CURRENT_INSTALLED_DIR}/include")
|
||||
# Used by GCC
|
||||
vcpkg_host_path_list(PREPEND ENV{C_INCLUDE_PATH} "${CURRENT_INSTALLED_DIR}/include")
|
||||
|
|
@ -659,10 +659,10 @@ function(vcpkg_configure_make)
|
|||
vcpkg_backup_env_variables(VARS _CL_ _LINK_)
|
||||
# TODO: Should be CPP flags instead -> rewrite when vcpkg_determined_cmake_compiler_flags defined
|
||||
if(VCPKG_TARGET_IS_UWP)
|
||||
# Be aware that configure thinks it is crosscompiling due to:
|
||||
# error while loading shared libraries: VCRUNTIME140D_APP.dll:
|
||||
# Be aware that configure thinks it is crosscompiling due to:
|
||||
# error while loading shared libraries: VCRUNTIME140D_APP.dll:
|
||||
# cannot open shared object file: No such file or directory
|
||||
# IMPORTANT: The only way to pass linker flags through libtool AND the compile wrapper
|
||||
# IMPORTANT: The only way to pass linker flags through libtool AND the compile wrapper
|
||||
# is to use the CL and LINK environment variables !!!
|
||||
# (This is due to libtool and compiler wrapper using the same set of options to pass those variables around)
|
||||
file(TO_CMAKE_PATH "$ENV{VCToolsInstallDir}" VCToolsInstallDir)
|
||||
|
|
@ -688,9 +688,9 @@ function(vcpkg_configure_make)
|
|||
if(VCPKG_TARGET_IS_UWP)
|
||||
set(x_vcpkg_transform_libs OFF)
|
||||
# Avoid libtool choke: "Warning: linker path does not have real file for library -lWindowsApp."
|
||||
# The problem with the choke is that libtool always falls back to built a static library even if a dynamic was requested.
|
||||
# Note: Env LIBPATH;LIB are on the search path for libtool by default on windows.
|
||||
# It even does unix/dos-short/unix transformation with the path to get rid of spaces.
|
||||
# The problem with the choke is that libtool always falls back to built a static library even if a dynamic was requested.
|
||||
# Note: Env LIBPATH;LIB are on the search path for libtool by default on windows.
|
||||
# It even does unix/dos-short/unix transformation with the path to get rid of spaces.
|
||||
endif()
|
||||
if(x_vcpkg_transform_libs)
|
||||
list(TRANSFORM all_libs_list REPLACE "[.](dll[.]lib|lib|a|so)$" "")
|
||||
|
|
@ -855,7 +855,7 @@ function(vcpkg_configure_make)
|
|||
unset(lib_env_vars)
|
||||
|
||||
set(command "${base_cmd}" -c "${configure_env} ./${relative_build_path}/configure ${arg_BUILD_TRIPLET} ${arg_OPTIONS} ${arg_OPTIONS_${current_buildtype}}")
|
||||
|
||||
|
||||
if(arg_ADD_BIN_TO_PATH)
|
||||
set(path_backup $ENV{PATH})
|
||||
vcpkg_add_to_path("${CURRENT_INSTALLED_DIR}${path_suffix_${current_buildtype}}/bin")
|
||||
|
|
@ -879,11 +879,11 @@ function(vcpkg_configure_make)
|
|||
endif()
|
||||
endif()
|
||||
z_vcpkg_restore_pkgconfig_path()
|
||||
|
||||
|
||||
if(DEFINED link_config_backup)
|
||||
set(ENV{_LINK_} "${link_config_backup}")
|
||||
endif()
|
||||
|
||||
|
||||
if(arg_ADD_BIN_TO_PATH)
|
||||
set(ENV{PATH} "${path_backup}")
|
||||
endif()
|
||||
|
|
|
|||
|
|
@ -245,7 +245,7 @@ function(z_vcpkg_get_build_and_host_system build_system host_system is_cross) #h
|
|||
set(host_unkown TRUE)
|
||||
endif()
|
||||
|
||||
set(host "[host_machine]\n") # host=target in vcpkg.
|
||||
set(host "[host_machine]\n") # host=target in vcpkg.
|
||||
string(APPEND host "endian = 'little'\n")
|
||||
if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_TARGET_IS_MINGW OR VCPKG_TARGET_IS_UWP)
|
||||
set(meson_system_name "windows")
|
||||
|
|
@ -260,7 +260,7 @@ function(z_vcpkg_get_build_and_host_system build_system host_system is_cross) #h
|
|||
endif()
|
||||
|
||||
if(NOT build_cpu_fam MATCHES "${host_cpu_fam}"
|
||||
OR VCPKG_TARGET_IS_ANDROID OR VCPKG_TARGET_IS_IOS OR VCPKG_TARGET_IS_VISIONOS OR VCPKG_TARGET_IS_UWP
|
||||
OR VCPKG_TARGET_IS_ANDROID OR VCPKG_TARGET_IS_IOS OR VCPKG_TARGET_IS_WATCHOS OR VCPKG_TARGET_IS_TVOS OR VCPKG_TARGET_IS_VISIONOS OR VCPKG_TARGET_IS_UWP
|
||||
OR (VCPKG_TARGET_IS_MINGW AND NOT CMAKE_HOST_WIN32))
|
||||
set(${is_cross} TRUE PARENT_SCOPE)
|
||||
endif()
|
||||
|
|
|
|||
|
|
@ -32,6 +32,9 @@ if(NOT _VCPKG_IOS_TOOLCHAIN)
|
|||
if ("${arch}" STREQUAL "arm64")
|
||||
set(_vcpkg_ios_system_processor "aarch64")
|
||||
set(_vcpkg_ios_target_architecture "arm64")
|
||||
elseif("${arch}" STREQUAL "arm64_32")
|
||||
set(_vcpkg_ios_system_processor "aarch64")
|
||||
set(_vcpkg_ios_target_architecture "arm64_32")
|
||||
elseif("${arch}" STREQUAL "arm")
|
||||
set(_vcpkg_ios_system_processor "arm")
|
||||
set(_vcpkg_ios_target_architecture "armv7")
|
||||
|
|
|
|||
|
|
@ -0,0 +1,5 @@
|
|||
set(VCPKG_TARGET_ARCHITECTURE arm)
|
||||
set(VCPKG_CRT_LINKAGE dynamic)
|
||||
set(VCPKG_LIBRARY_LINKAGE static)
|
||||
set(VCPKG_CMAKE_SYSTEM_NAME watchOS)
|
||||
set(VCPKG_OSX_SYSROOT watchos)
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
set(VCPKG_TARGET_ARCHITECTURE arm64)
|
||||
set(VCPKG_CRT_LINKAGE dynamic)
|
||||
set(VCPKG_LIBRARY_LINKAGE static)
|
||||
set(VCPKG_CMAKE_SYSTEM_NAME tvOS)
|
||||
set(VCPKG_OSX_SYSROOT appletvsimulator)
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
set(VCPKG_TARGET_ARCHITECTURE arm64)
|
||||
set(VCPKG_CRT_LINKAGE dynamic)
|
||||
set(VCPKG_LIBRARY_LINKAGE static)
|
||||
set(VCPKG_CMAKE_SYSTEM_NAME tvOS)
|
||||
set(VCPKG_OSX_SYSROOT appletvos)
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
set(VCPKG_TARGET_ARCHITECTURE arm64)
|
||||
set(VCPKG_CRT_LINKAGE dynamic)
|
||||
set(VCPKG_LIBRARY_LINKAGE static)
|
||||
set(VCPKG_CMAKE_SYSTEM_NAME watchOS)
|
||||
set(VCPKG_OSX_SYSROOT watchsimulator)
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
set(VCPKG_TARGET_ARCHITECTURE arm64)
|
||||
set(VCPKG_CRT_LINKAGE dynamic)
|
||||
set(VCPKG_LIBRARY_LINKAGE static)
|
||||
set(VCPKG_CMAKE_SYSTEM_NAME watchOS)
|
||||
set(VCPKG_OSX_SYSROOT watchos)
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
set(VCPKG_TARGET_ARCHITECTURE arm64_32)
|
||||
set(VCPKG_CRT_LINKAGE dynamic)
|
||||
set(VCPKG_LIBRARY_LINKAGE static)
|
||||
set(VCPKG_CMAKE_SYSTEM_NAME watchOS)
|
||||
set(VCPKG_OSX_SYSROOT watchos)
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
set(VCPKG_TARGET_ARCHITECTURE x64)
|
||||
set(VCPKG_CRT_LINKAGE dynamic)
|
||||
set(VCPKG_LIBRARY_LINKAGE static)
|
||||
set(VCPKG_CMAKE_SYSTEM_NAME tvOS)
|
||||
set(VCPKG_OSX_SYSROOT appletvsimulator)
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
set(VCPKG_TARGET_ARCHITECTURE x64)
|
||||
set(VCPKG_CRT_LINKAGE dynamic)
|
||||
set(VCPKG_LIBRARY_LINKAGE static)
|
||||
set(VCPKG_CMAKE_SYSTEM_NAME watchOS)
|
||||
set(VCPKG_OSX_SYSROOT watchsimulator)
|
||||
Loading…
Reference in New Issue