Cross-compilation for ARM on Windows (#14933)
This commit is contained in:
parent
13d01d969b
commit
10253c1b12
6
thirdparty/protobuf/CMakeLists.txt
vendored
6
thirdparty/protobuf/CMakeLists.txt
vendored
@ -26,8 +26,10 @@ set(protobuf_BUILD_TESTS OFF CACHE BOOL "Build tests" FORCE)
|
|||||||
set(protobuf_BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared libs" FORCE)
|
set(protobuf_BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared libs" FORCE)
|
||||||
set(protobuf_WITH_ZLIB OFF CACHE BOOL "Build with zlib support" FORCE)
|
set(protobuf_WITH_ZLIB OFF CACHE BOOL "Build with zlib support" FORCE)
|
||||||
|
|
||||||
# note: HOST_AARCH64 AND X86_64 are not handled for Apple explicitly, becuase it can work via Rosetta
|
# note: HOST_AARCH64 AND X86_64 are not handled for Apple explicitly, because it can work via Rosetta
|
||||||
if(CMAKE_CROSSCOMPILING OR (APPLE AND (HOST_X86_64 AND AARCH64)) )
|
if(CMAKE_CROSSCOMPILING OR
|
||||||
|
(APPLE AND (HOST_X86_64 AND AARCH64)) OR
|
||||||
|
(MSVC AND (HOST_X86_64 AND (AARCH64 OR ARM))))
|
||||||
set(protobuf_BUILD_PROTOC_BINARIES OFF CACHE BOOL "Build protoc binaries" FORCE)
|
set(protobuf_BUILD_PROTOC_BINARIES OFF CACHE BOOL "Build protoc binaries" FORCE)
|
||||||
else()
|
else()
|
||||||
set(protobuf_BUILD_PROTOC_BINARIES ON CACHE BOOL "Build protoc binaries" FORCE)
|
set(protobuf_BUILD_PROTOC_BINARIES ON CACHE BOOL "Build protoc binaries" FORCE)
|
||||||
|
Loading…
Reference in New Issue
Block a user