diff --git a/deps/+GMP/GMP.cmake b/deps/+GMP/GMP.cmake index 742a2f858a..724db2eeab 100644 --- a/deps/+GMP/GMP.cmake +++ b/deps/+GMP/GMP.cmake @@ -21,10 +21,20 @@ else () set(_gmp_ccflags "${CMAKE_CXX_FLAGS_${_buildtype_upper}} -fPIC -DPIC -Wall -Wmissing-prototypes -Wpointer-arith -pedantic -fomit-frame-pointer -fno-common") set(_gmp_build_tgt "${CMAKE_SYSTEM_PROCESSOR}") + set(_cross_compile_arg "") if (APPLE) - if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm") + if (CMAKE_OSX_ARCHITECTURES) + set(_gmp_build_tgt ${CMAKE_OSX_ARCHITECTURES}) + set(_gmp_ccflags "${_gmp_ccflags} -arch ${CMAKE_OSX_ARCHITECTURES}") + endif () + if (${_gmp_build_tgt} MATCHES "arm") set(_gmp_build_tgt aarch64) endif() + + if (CMAKE_OSX_ARCHITECTURES) + set(_cross_compile_arg --host=${_gmp_build_tgt}-apple-darwin21) + endif () + set(_gmp_ccflags "${_gmp_ccflags} -mmacosx-version-min=${DEP_OSX_TARGET}") set(_gmp_build_tgt "--build=${_gmp_build_tgt}-apple-darwin") elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux") @@ -37,7 +47,6 @@ else () set(_gmp_build_tgt "") # let it guess endif() - set(_cross_compile_arg "") if (CMAKE_CROSSCOMPILING) # TOOLCHAIN_PREFIX should be defined in the toolchain file set(_cross_compile_arg --host=${TOOLCHAIN_PREFIX}) diff --git a/deps/CMakePresets.json b/deps/CMakePresets.json index 8940da8e01..d051c81de1 100644 --- a/deps/CMakePresets.json +++ b/deps/CMakePresets.json @@ -25,7 +25,6 @@ { "name": "mac_universal_x86", "inherits": "default", - "generator": "Ninja", "binaryDir": "${sourceDir}/build-x86_64", "condition": { "type": "equals", @@ -39,7 +38,6 @@ { "name": "mac_universal_arm", "inherits": "default", - "generator": "Ninja", "binaryDir": "${sourceDir}/build-arm64", "condition": { "type": "equals",