diff options
| author | Sam Freed <sfreed141@gmail.com> | 2019-02-06 13:08:57 -0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2019-02-06 13:08:57 -0800 |
| commit | ae991ee6ca224b2674aa24c7c705b5c36dcbb361 (patch) | |
| tree | 69156b10200c8c0506d6bb5ce932c2efdafb7a72 /scripts | |
| parent | 62f294eeaebaba978634fee5641e507ac997bcf7 (diff) | |
| download | vcpkg-ae991ee6ca224b2674aa24c7c705b5c36dcbb361.tar.gz vcpkg-ae991ee6ca224b2674aa24c7c705b5c36dcbb361.zip | |
Warn when unable to determine target architecture instead of error (#5188)
* Warn when unable to determine target architecture instead of error
* Make the warning not appear multiple times
* fix multiple warnings for real
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/buildsystems/vcpkg.cmake | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index 91c196fb9..4ffb123d4 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -50,7 +50,13 @@ else() elseif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "x86_64") set(_VCPKG_TARGET_TRIPLET_ARCH x64) else() - message(FATAL_ERROR "Unable to determine target architecture.") + if( _CMAKE_IN_TRY_COMPILE ) + message(STATUS "Unable to determine target architecture, continuing without vcpkg.") + else() + message(WARNING "Unable to determine target architecture, continuing without vcpkg.") + endif() + set(VCPKG_TOOLCHAIN ON) + return() endif() endif() endif() |