diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake index 82eca0f1e0ddc0..60e9d2030c52b4 100644 --- a/ports/ffmpeg/portfile.cmake +++ b/ports/ffmpeg/portfile.cmake @@ -539,6 +539,12 @@ if(VCPKG_TARGET_IS_UWP) string(APPEND OPTIONS " --extra-ldflags=-APPCONTAINER --extra-ldflags=WindowsApp.lib") endif() +message("XAJM - ffmpeg portfile.cmake 1") +if(VCPKG_TARGET_IS_IOS) + message("XAJM - ffmpeg portfile.cmake 1 setting flags") + string(APPEND OPTIONS " --extra-ldflags=-Wl,-ld_classic") +endif() + set(OPTIONS_DEBUG "--debug --disable-optimizations") set(OPTIONS_RELEASE "--enable-optimizations") diff --git a/ports/glib/portfile.cmake b/ports/glib/portfile.cmake index 6a5fc3494793c0..e366e3a6f00fcc 100644 --- a/ports/glib/portfile.cmake +++ b/ports/glib/portfile.cmake @@ -11,6 +11,8 @@ vcpkg_extract_source_archive(SOURCE_PATH use-libiconv-on-windows.patch libintl.patch tsc-allow-threadpriority-to-fail-windows.patch + tsc-disable-libproc.patch + tsc-remove-internal-check.patch ) if(APPLE) diff --git a/ports/glib/tsc-disable-libproc.patch b/ports/glib/tsc-disable-libproc.patch new file mode 100644 index 00000000000000..f22031feaf2cb5 --- /dev/null +++ b/ports/glib/tsc-disable-libproc.patch @@ -0,0 +1,53 @@ +diff --git a/glib/gspawn.c b/glib/gspawn.c +index 581729733..e132ca40a 100644 +--- a/glib/gspawn.c ++++ b/glib/gspawn.c +@@ -70,11 +70,6 @@ + #include "glibintl.h" + #include "glib-unix.h" + +-#ifdef __APPLE__ +-#include +-#include +-#endif +- + #define INHERITS_OR_NULL_STDIN (G_SPAWN_STDIN_FROM_DEV_NULL | G_SPAWN_CHILD_INHERITS_STDIN) + #define INHERITS_OR_NULL_STDOUT (G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_CHILD_INHERITS_STDOUT) + #define INHERITS_OR_NULL_STDERR (G_SPAWN_STDERR_TO_DEV_NULL | G_SPAWN_CHILD_INHERITS_STDERR) +@@ -1544,36 +1539,6 @@ safe_fdwalk_with_invalid_fds (int (*cb)(void *data, int fd), void *data) + if (open_max < 0) + open_max = 4096; + +-#if defined(__APPLE__) +- /* proc_pidinfo isn't documented as async-signal-safe but looking at the implementation +- * in the darwin tree here: +- * +- * https://opensource.apple.com/source/Libc/Libc-498/darwin/libproc.c.auto.html +- * +- * It's just a thin wrapper around a syscall, so it's probably okay. +- */ +- { +- char buffer[4096 * PROC_PIDLISTFD_SIZE]; +- ssize_t buffer_size; +- +- buffer_size = proc_pidinfo (getpid (), PROC_PIDLISTFDS, 0, buffer, sizeof (buffer)); +- +- if (buffer_size > 0 && +- sizeof (buffer) >= (size_t) buffer_size && +- (buffer_size % PROC_PIDLISTFD_SIZE) == 0) +- { +- const struct proc_fdinfo *fd_info = (const struct proc_fdinfo *) buffer; +- size_t number_of_fds = (size_t) buffer_size / PROC_PIDLISTFD_SIZE; +- +- for (size_t i = 0; i < number_of_fds; i++) +- if ((res = cb (data, fd_info[i].proc_fd)) != 0) +- break; +- +- return res; +- } +- } +-#endif +- + for (fd = 0; fd < open_max; fd++) + if ((res = cb (data, fd)) != 0) + break; diff --git a/ports/glib/tsc-remove-internal-check.patch b/ports/glib/tsc-remove-internal-check.patch new file mode 100644 index 00000000000000..f5c65fa68595a7 --- /dev/null +++ b/ports/glib/tsc-remove-internal-check.patch @@ -0,0 +1,13 @@ +diff --git a/meson.build b/meson.build +index 6ed945967..be2bf0250 100644 +--- a/meson.build ++++ b/meson.build +@@ -2116,7 +2116,7 @@ if libintl.found() + have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset', dependencies: libintl_deps) + else + libintl = dependency('intl', allow_fallback: true) +- assert(libintl.type_name() == 'internal') ++ #assert(libintl.type_name() == 'internal') + libintl_deps = [libintl] + have_bind_textdomain_codeset = true # proxy-libintl supports it + endif diff --git a/ports/mp3lame/portfile.cmake b/ports/mp3lame/portfile.cmake index 38fb8f21582850..95ebcb27ef0f1b 100644 --- a/ports/mp3lame/portfile.cmake +++ b/ports/mp3lame/portfile.cmake @@ -84,10 +84,10 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) else() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - set(OPTIONS --enable-static=yes --enable-shared=no) + set(OPTIONS --enable-static=yes --enable-shared=no --disable-frontend) set(MP3LAME_LIB "libmp3lame${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}") else() - set(OPTIONS --enable-shared=yes --enable-static=no) + set(OPTIONS --enable-shared=yes --enable-static=no --disable-frontend) if(VCPKG_TARGET_IMPORT_LIBRARY_SUFFIX) set(MP3LAME_LIB "libmp3lame${VCPKG_TARGET_IMPORT_LIBRARY_SUFFIX}") else() diff --git a/ports/pixman/portfile.cmake b/ports/pixman/portfile.cmake index 9835b6bff128a1..c444f091c45e93 100644 --- a/ports/pixman/portfile.cmake +++ b/ports/pixman/portfile.cmake @@ -37,11 +37,19 @@ if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE MATCHES "arm") ) endif() +message("XAJM - VCPKG_TARGET_IS_OSX = ${VCPKG_TARGET_IS_OSX}") +message("XAJM - VCPKG_TARGET_IS_IOS = ${VCPKG_TARGET_IS_IOS}") if(VCPKG_TARGET_IS_OSX) # https://github.com/microsoft/vcpkg/issues/29168 list(APPEND OPTIONS -Da64-neon=disabled) endif() +if(VCPKG_TARGET_IS_IOS) +message("XAJM - VCPKG_TARGET_IS_IOS = ${VCPKG_TARGET_IS_IOS} huzzah") + # https://github.com/microsoft/vcpkg/issues/29168 + list(APPEND OPTIONS -Da64-neon=disabled) +endif() + vcpkg_from_gitlab( OUT_SOURCE_PATH SOURCE_PATH GITLAB_URL https://gitlab.freedesktop.org diff --git a/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake b/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake index d7e673751d5cc3..f6a842773a85cd 100644 --- a/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake +++ b/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake @@ -159,10 +159,11 @@ function(vcpkg_cmake_configure) z_vcpkg_select_default_vcpkg_chainload_toolchain() endif() + message("XAJM - IDK is this where we call vcpkg.cmake with ${TARGET_TRIPLET}") list(JOIN VCPKG_TARGET_ARCHITECTURE "\;" target_architecture_string) vcpkg_list(APPEND arg_OPTIONS - "-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}" "-DVCPKG_TARGET_TRIPLET=${TARGET_TRIPLET}" + "-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}" "-DVCPKG_SET_CHARSET_FLAG=${VCPKG_SET_CHARSET_FLAG}" "-DVCPKG_PLATFORM_TOOLSET=${VCPKG_PLATFORM_TOOLSET}" "-DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON" diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index fdd82f07c1f371..cc0c7707931685 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -21,6 +21,24 @@ This `Z_VCPKG_HAS_FATAL_ERROR` must be checked before any filesystem operations since otherwise you might be doing something with bad variables set up. #]===] # this is defined above everything else so that it can be used. + +set(VCPKG_TARGET_ARCHITECTURE arm64) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE dynamic) + +set(VCPKG_CMAKE_SYSTEM_NAME iOS) +set(VCPKG_OSX_ARCHITECTURES arm64) +set(VCPKG_CMAKE_OSX_ARCHITECTURES arm64) + +#set(VCPKG_ENV_PASSTHROUGH_UNTRACKED VCPKG_ROOT) + +set(VCPKG_BUILD_TYPE release) + +#set(VCPKG_C_FLAGS -mmacosx-version-min=11.0) +#set(VCPKG_CXX_FLAGS -mmacosx-version-min=11.0) +#set(VCPKG_LINKER_FLAGS -mmacosx-version-min=11.0) + + set(Z_VCPKG_FATAL_ERROR) set(Z_VCPKG_HAS_FATAL_ERROR OFF) function(z_vcpkg_add_fatal_error ERROR) @@ -205,6 +223,8 @@ endfunction() # Determine whether the toolchain is loaded during a try-compile configuration get_property(Z_VCPKG_CMAKE_IN_TRY_COMPILE GLOBAL PROPERTY IN_TRY_COMPILE) +message("XAJM - vcpkg.cmake VCPKG_TARGET_ARCHITECTURE is ${VCPKG_TARGET_ARCHITECTURE}") +message("XAJM - VCPKG_CHAINLOAD_TOOLCHAIN_FILE is ${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}") if(VCPKG_CHAINLOAD_TOOLCHAIN_FILE) include("${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}") endif() @@ -230,6 +250,7 @@ if(NOT DEFINED CMAKE_MAP_IMPORTED_CONFIG_RELWITHDEBINFO) endif() endif() +message("XAJM - VCPKG_TARGET_TRIPLET is ${VCPKG_TARGET_TRIPLET}") if(VCPKG_TARGET_TRIPLET) # This is required since a user might do: 'set(VCPKG_TARGET_TRIPLET somevalue)' [no CACHE] before the first project() call # Latter within the toolchain file we do: 'set(VCPKG_TARGET_TRIPLET somevalue CACHE STRING "")' which @@ -351,6 +372,7 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux" OR (NOT CMAKE_SYSTEM_NAME AND CMAKE_HO elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin" OR (NOT CMAKE_SYSTEM_NAME AND CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin")) set(Z_VCPKG_TARGET_TRIPLET_PLAT osx) elseif(CMAKE_SYSTEM_NAME STREQUAL "iOS") + message("XAJM - new 1") set(Z_VCPKG_TARGET_TRIPLET_PLAT ios) elseif(MINGW) set(Z_VCPKG_TARGET_TRIPLET_PLAT mingw-dynamic) @@ -376,6 +398,7 @@ endif() set(VCPKG_TARGET_TRIPLET "${Z_VCPKG_TARGET_TRIPLET_ARCH}-${Z_VCPKG_TARGET_TRIPLET_PLAT}" CACHE STRING "Vcpkg target triplet (ex. x86-windows)") set(Z_VCPKG_TOOLCHAIN_DIR "${CMAKE_CURRENT_LIST_DIR}") +message("XAJM - new zz VCPKG_TARGET_TRIPLET = ${VCPKG_TARGET_TRIPLET}") # Detect .vcpkg-root to figure VCPKG_ROOT_DIR set(Z_VCPKG_ROOT_DIR_CANDIDATE "${CMAKE_CURRENT_LIST_DIR}") while(NOT DEFINED Z_VCPKG_ROOT_DIR) @@ -789,6 +812,7 @@ macro("${VCPKG_OVERRIDE_FIND_PACKAGE_NAME}" z_vcpkg_find_package_package_name) # See https://gitlab.kitware.com/cmake/cmake/merge_requests/3273 # Fixed in CMake 3.15 if(CMAKE_SYSTEM_NAME STREQUAL "iOS") + message("XAJM - new 2") 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}") diff --git a/scripts/cmake/vcpkg_common_definitions.cmake b/scripts/cmake/vcpkg_common_definitions.cmake index b248208a2fb8e9..b1076a7b4ba278 100644 --- a/scripts/cmake/vcpkg_common_definitions.cmake +++ b/scripts/cmake/vcpkg_common_definitions.cmake @@ -1,5 +1,6 @@ string(COMPARE NOTEQUAL "${TARGET_TRIPLET}" "${HOST_TRIPLET}" VCPKG_CROSSCOMPILING) #Helper variable to identify the Target system. VCPKG_TARGET_IS_ +message("XAJM - where are we ${TARGET_TRIPLET} ${HOST_TRIPLET}") if (NOT DEFINED VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "") set(VCPKG_TARGET_IS_WINDOWS ON) @@ -12,7 +13,9 @@ elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin") set(VCPKG_TARGET_IS_OSX ON) elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "iOS") + message("XAJM - setting VCPKG_TARGET_IS_IOS") set(VCPKG_TARGET_IS_IOS ON) + message("XAJM - 1 VCPKG_TARGET_IS_IOS = ${VCPKG_TARGET_IS_IOS}") elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") set(VCPKG_TARGET_IS_LINUX ON) elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Android") diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake index b051bf8216a9df..dd07cb38b8962d 100644 --- a/scripts/cmake/vcpkg_configure_cmake.cmake +++ b/scripts/cmake/vcpkg_configure_cmake.cmake @@ -61,19 +61,26 @@ endfunction() function(z_vcpkg_select_default_vcpkg_chainload_toolchain) # Try avoiding adding more defaults here. # Set VCPKG_CHAINLOAD_TOOLCHAIN_FILE explicitly in the triplet. + message("XAJM - 2 VCPKG_TARGET_IS_IOS = ${VCPKG_TARGET_IS_IOS}") + message("XAJM - toolchain load") if(DEFINED Z_VCPKG_CHAINLOAD_TOOLCHAIN_FILE) + message("XAJM - toolchain load 1 ${Z_VCPKG_CHAINLOAD_TOOLCHAIN_FILE}") set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${Z_VCPKG_CHAINLOAD_TOOLCHAIN_FILE}") elseif(VCPKG_TARGET_IS_MINGW) + message("XAJM - toolchain load 2") set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/mingw.cmake") elseif(VCPKG_TARGET_IS_WINDOWS) + message("XAJM - toolchain load 1") set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/windows.cmake") elseif(VCPKG_TARGET_IS_LINUX) set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/linux.cmake") elseif(VCPKG_TARGET_IS_ANDROID) set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/android.cmake") elseif(VCPKG_TARGET_IS_OSX) + message("XAJM - toolchain load 1") set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/osx.cmake") elseif(VCPKG_TARGET_IS_IOS) + message("XAJM - toolchain load 2") set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/ios.cmake") elseif(VCPKG_TARGET_IS_FREEBSD) set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/freebsd.cmake") diff --git a/scripts/cmake/vcpkg_configure_meson.cmake b/scripts/cmake/vcpkg_configure_meson.cmake index 21b830524293af..1c5e0e94c9436d 100644 --- a/scripts/cmake/vcpkg_configure_meson.cmake +++ b/scripts/cmake/vcpkg_configure_meson.cmake @@ -148,7 +148,7 @@ function(z_vcpkg_get_build_and_host_system build_system host_system is_cross) #h if(MACHINE MATCHES "arm64|aarch64") set(build_cpu_fam aarch64) - set(build_cpu armv8) + set(build_cpu arm64) elseif(MACHINE MATCHES "armv7h?l") set(build_cpu_fam arm) set(build_cpu ${MACHINE}) @@ -347,7 +347,7 @@ function(vcpkg_configure_meson) set(meson_input_file_${buildname} "${CURRENT_BUILDTREES_DIR}/meson-${TARGET_TRIPLET}-${suffix_${buildname}}.log") endif() - vcpkg_list(APPEND arg_OPTIONS --buildtype plain --backend ninja --wrap-mode nodownload) + vcpkg_list(APPEND arg_OPTIONS --buildtype plain --backend ninja --wrap-mode default) z_vcpkg_get_build_and_host_system(MESON_HOST_MACHINE MESON_BUILD_MACHINE IS_CROSS) diff --git a/scripts/ports.cmake b/scripts/ports.cmake index e18ee37bde5ef7..97a157682ee74d 100644 --- a/scripts/ports.cmake +++ b/scripts/ports.cmake @@ -150,8 +150,9 @@ if(CMD STREQUAL "BUILD") endif() file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}" "${CURRENT_PACKAGES_DIR}") + message("XAJM - got file ${CMAKE_TRIPLET_FILE}") include("${CMAKE_TRIPLET_FILE}") - + message("Got VCPKG_CMAKE_SYSTEM_NAME ${VCPKG_CMAKE_SYSTEM_NAME}") set(HOST_TRIPLET "${_HOST_TRIPLET}") set(CURRENT_HOST_INSTALLED_DIR "${_VCPKG_INSTALLED_DIR}/${HOST_TRIPLET}" CACHE PATH "Location to install final packages for the host") diff --git a/scripts/toolchains/ios.cmake b/scripts/toolchains/ios.cmake index d9c3f8a312092e..d35401ef46aee2 100644 --- a/scripts/toolchains/ios.cmake +++ b/scripts/toolchains/ios.cmake @@ -1,6 +1,10 @@ if(NOT _VCPKG_IOS_TOOLCHAIN) set(_VCPKG_IOS_TOOLCHAIN 1) + #set(CMAKE_CXX_COMPILER /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang) + #set(CMAKE_C_COMPILER /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang) + + message("XAJM - here 1") # Set the CMAKE_SYSTEM_NAME for try_compile calls. set(CMAKE_SYSTEM_NAME iOS CACHE STRING "") @@ -13,6 +17,7 @@ if(NOT _VCPKG_IOS_TOOLCHAIN) set(_vcpkg_ios_system_processor "aarch64") set(_vcpkg_ios_target_architecture "arm64") elseif("${arch}" STREQUAL "arm") + message("XAJM - here 2") set(_vcpkg_ios_system_processor "arm") set(_vcpkg_ios_target_architecture "armv7") elseif("${arch}" STREQUAL "x64") @@ -24,11 +29,13 @@ if(NOT _VCPKG_IOS_TOOLCHAIN) set(_vcpkg_ios_sysroot "iphonesimulator") set(_vcpkg_ios_target_architecture "i386") else() + message("XAJM - here 3") message(FATAL_ERROR "Unknown VCPKG_TARGET_ARCHITECTURE value provided for triplet ${VCPKG_TARGET_TRIPLET}: ${arch}") endif() endmacro() + message("XAJM - arch is ${VCPKG_TARGET_ARCHITECTURE}") _vcpkg_setup_ios_arch("${VCPKG_TARGET_ARCHITECTURE}") if(_vcpkg_ios_system_processor AND NOT CMAKE_SYSTEM_PROCESSOR) set(CMAKE_SYSTEM_PROCESSOR ${_vcpkg_ios_system_processor}) @@ -38,11 +45,15 @@ if(NOT _VCPKG_IOS_TOOLCHAIN) # so the following will be no-ops. set(CMAKE_OSX_ARCHITECTURES "${_vcpkg_ios_target_architecture}" CACHE STRING "Build architectures for iOS") if(_vcpkg_ios_sysroot) + message("XAJM - here 4") set(CMAKE_OSX_SYSROOT ${_vcpkg_ios_sysroot} CACHE STRING "iOS sysroot") + else() + message("XAJM - here 5") endif() get_property( _CMAKE_IN_TRY_COMPILE GLOBAL PROPERTY IN_TRY_COMPILE ) if(NOT _CMAKE_IN_TRY_COMPILE) + message("XAJM - here 6") string(APPEND CMAKE_C_FLAGS_INIT " -fPIC ${VCPKG_C_FLAGS} ") string(APPEND CMAKE_CXX_FLAGS_INIT " -fPIC ${VCPKG_CXX_FLAGS} ") string(APPEND CMAKE_C_FLAGS_DEBUG_INIT " ${VCPKG_C_FLAGS_DEBUG} ") @@ -59,5 +70,8 @@ if(NOT _VCPKG_IOS_TOOLCHAIN) string(APPEND CMAKE_MODULE_LINKER_FLAGS_RELEASE_INIT " ${VCPKG_LINKER_FLAGS_RELEASE} ") string(APPEND CMAKE_SHARED_LINKER_FLAGS_RELEASE_INIT " ${VCPKG_LINKER_FLAGS_RELEASE} ") string(APPEND CMAKE_EXE_LINKER_FLAGS_RELEASE_INIT " ${VCPKG_LINKER_FLAGS_RELEASE} ") + else() + + message("XAJM - here 7") endif() endif() diff --git a/triplets/community/arm64-ios-dynamic-debug.cmake b/triplets/community/arm64-ios-dynamic-debug.cmake new file mode 100644 index 00000000000000..666381bd3e3b06 --- /dev/null +++ b/triplets/community/arm64-ios-dynamic-debug.cmake @@ -0,0 +1,12 @@ +set(VCPKG_TARGET_ARCHITECTURE arm64) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE dynamic) + +set(VCPKG_CMAKE_SYSTEM_NAME iOS) +set(VCPKG_OSX_ARCHITECTURES arm64) + +set(VCPKG_CMAKE_OSX_ARCHITECTURES arm64) + +set(VCPKG_ENV_PASSTHROUGH_UNTRACKED VCPKG_ROOT) + +set(VCPKG_BUILD_TYPE debug) diff --git a/triplets/community/arm64-ios-dynamic-release.cmake b/triplets/community/arm64-ios-dynamic-release.cmake new file mode 100644 index 00000000000000..6c3827f302a09c --- /dev/null +++ b/triplets/community/arm64-ios-dynamic-release.cmake @@ -0,0 +1,15 @@ +set(VCPKG_TARGET_ARCHITECTURE arm64) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE dynamic) + +set(VCPKG_CMAKE_SYSTEM_NAME iOS) +set(VCPKG_OSX_ARCHITECTURES arm64) +set(VCPKG_CMAKE_OSX_ARCHITECTURES arm64) + +set(VCPKG_ENV_PASSTHROUGH_UNTRACKED VCPKG_ROOT) + +set(VCPKG_BUILD_TYPE release) + +#set(VCPKG_C_FLAGS -mmacosx-version-min=11.0) +#set(VCPKG_CXX_FLAGS -mmacosx-version-min=11.0) +#set(VCPKG_LINKER_FLAGS -mmacosx-version-min=11.0) diff --git a/triplets/community/arm64-ios-static-debug.cmake b/triplets/community/arm64-ios-static-debug.cmake new file mode 100644 index 00000000000000..4530369804fa9e --- /dev/null +++ b/triplets/community/arm64-ios-static-debug.cmake @@ -0,0 +1,12 @@ +set(VCPKG_TARGET_ARCHITECTURE arm64) +set(VCPKG_CRT_LINKAGE static) +set(VCPKG_LIBRARY_LINKAGE static) + +set(VCPKG_CMAKE_SYSTEM_NAME iOS) +set(VCPKG_OSX_ARCHITECTURES arm64) + +set(VCPKG_CMAKE_OSX_ARCHITECTURES arm64) + +set(VCPKG_ENV_PASSTHROUGH_UNTRACKED VCPKG_ROOT) + +set(VCPKG_BUILD_TYPE debug) diff --git a/triplets/community/arm64-ios-static-release.cmake b/triplets/community/arm64-ios-static-release.cmake new file mode 100644 index 00000000000000..b632001abe2a69 --- /dev/null +++ b/triplets/community/arm64-ios-static-release.cmake @@ -0,0 +1,12 @@ +set(VCPKG_TARGET_ARCHITECTURE arm64) +set(VCPKG_CRT_LINKAGE static) +set(VCPKG_LIBRARY_LINKAGE static) + +set(VCPKG_CMAKE_SYSTEM_NAME iOS) +set(VCPKG_OSX_ARCHITECTURES arm64) + +set(VCPKG_CMAKE_OSX_ARCHITECTURES arm64) + +set(VCPKG_ENV_PASSTHROUGH_UNTRACKED VCPKG_ROOT) + +set(VCPKG_BUILD_TYPE release) diff --git a/triplets/community/arm64-osx-dynamic-release copy.cmake b/triplets/community/arm64-osx-dynamic-release copy.cmake new file mode 100644 index 00000000000000..b67a5f66b3652f --- /dev/null +++ b/triplets/community/arm64-osx-dynamic-release copy.cmake @@ -0,0 +1,12 @@ +set(VCPKG_TARGET_ARCHITECTURE arm64) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE dynamic) + +set(VCPKG_CMAKE_SYSTEM_NAME iOS) +set(VCPKG_OSX_ARCHITECTURES arm64) + +set(VCPKG_BUILD_TYPE release) + +#set(VCPKG_C_FLAGS -mmacosx-version-min=11.0) +#set(VCPKG_CXX_FLAGS -mmacosx-version-min=11.0) +#set(VCPKG_LINKER_FLAGS -mmacosx-version-min=11.0)