mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-05 11:39:09 +08:00
20584b9d44
* [libtorch] update to 2.1.2 * adjust features and deps * remove dep * fix onnx case * use system fxdiv * update xnnpack * fxdiv fix in libtorch * add newline * xnnpack does not install configs * more patching * fix patch * more fixes * use full lib for sleef. * fix glog symbol on osx * try fixing msvc ice * ok renaming did nothing * v db * remove comments * v db * cuda is only for x64 * v db * fix usage since cuda is still external to vcpkg * v db --------- Co-authored-by: Jim wang (BEYONDSOFT CONSULTING INC) <v-wangjim@microsoft.com>
14 lines
603 B
Diff
14 lines
603 B
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index fa6da328b..80bbfc6bb 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -686,7 +686,7 @@ if(NOT CMAKE_BUILD_TYPE)
|
|
endif()
|
|
|
|
# The below means we are cross compiling for arm64 or x86_64 on MacOSX
|
|
-if(NOT IOS AND CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_OSX_ARCHITECTURES MATCHES "^(x86_64|arm64)$")
|
|
+if(0)
|
|
set(CROSS_COMPILING_MACOSX TRUE)
|
|
# We need to compile a universal protoc to not fail protobuf build
|
|
# We set CMAKE_TRY_COMPILE_TARGET_TYPE to STATIC_LIBRARY (vs executable) to succeed the cmake compiler check for cross-compiling
|