diff options
| author | Todor Prokopov <koprok@users.noreply.github.com> | 2020-07-31 08:37:02 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-30 22:37:02 -0700 |
| commit | fe19c5e41167336d8b9d52f3dff44caa72fd6bfa (patch) | |
| tree | 04a57599756686520b0f501ed6079737a15fb039 /ports/protobuf | |
| parent | 5cdb92f010d8251e8e6ec62ccaed867547a6373a (diff) | |
| download | vcpkg-fe19c5e41167336d8b9d52f3dff44caa72fd6bfa.tar.gz vcpkg-fe19c5e41167336d8b9d52f3dff44caa72fd6bfa.zip | |
Mingw port fixes (#12103)
* [openal-soft] MinGW build fixes
* [glew] MinGW build fixes
* [protobuf] MinGW build fixes
* [protobuf] Update to 3.12.3
* [protobuf] Preserve existing cross-compilation behavior (e.g. android)
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Diffstat (limited to 'ports/protobuf')
| -rw-r--r-- | ports/protobuf/portfile.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ports/protobuf/portfile.cmake b/ports/protobuf/portfile.cmake index 2c4497fe0..4bfc11644 100644 --- a/ports/protobuf/portfile.cmake +++ b/ports/protobuf/portfile.cmake @@ -12,7 +12,7 @@ vcpkg_from_github( if(CMAKE_HOST_WIN32 AND NOT VCPKG_TARGET_ARCHITECTURE MATCHES "x64" AND NOT VCPKG_TARGET_ARCHITECTURE MATCHES "x86") set(protobuf_BUILD_PROTOC_BINARIES OFF) -elseif(CMAKE_HOST_WIN32 AND VCPKG_CMAKE_SYSTEM_NAME) +elseif(CMAKE_HOST_WIN32 AND NOT VCPKG_TARGET_IS_MINGW AND NOT (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_UWP)) set(protobuf_BUILD_PROTOC_BINARIES OFF) else() set(protobuf_BUILD_PROTOC_BINARIES ON) |