aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2019-03-05 14:42:07 -0800
committerPhil Christensen <philc@microsoft.com>2019-03-05 14:42:07 -0800
commit9164049386b38655aa6ce74fa4d0ec6edd9e0d80 (patch)
tree67944e7a4844ca80bf30f865706c3fa0bc45df9a /scripts
parente424790f73bc810397be60fa009b2c572a23f98b (diff)
downloadvcpkg-9164049386b38655aa6ce74fa4d0ec6edd9e0d80.tar.gz
vcpkg-9164049386b38655aa6ce74fa4d0ec6edd9e0d80.zip
[vcpkg] Add more detailed error message when trying to use v142 and an msbuild generator (#5422)
Diffstat (limited to 'scripts')
-rw-r--r--scripts/cmake/vcpkg_configure_cmake.cmake13
1 files changed, 13 insertions, 0 deletions
diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake
index f7b81de93..584e93251 100644
--- a/scripts/cmake/vcpkg_configure_cmake.cmake
+++ b/scripts/cmake/vcpkg_configure_cmake.cmake
@@ -109,7 +109,20 @@ function(vcpkg_configure_cmake)
elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" AND VCPKG_PLATFORM_TOOLSET MATCHES "v141")
set(GENERATOR "Visual Studio 15 2017")
set(ARCH "ARM64")
+ elseif(VCPKG_PLATFORM_TOOLSET MATCHES "v142")
+ if(NOT VCPKG_CMAKE_SYSTEM_NAME)
+ set(VCPKG_CMAKE_SYSTEM_NAME Windows)
+ endif()
+ message(FATAL_ERROR
+"Unable to determine appropriate CMake MSBuild generator for: ${VCPKG_CMAKE_SYSTEM_NAME}-${VCPKG_TARGET_ARCHITECTURE}-${VCPKG_PLATFORM_TOOLSET}.
+This is because CMake 3.12.4 does not currently have a 'Visual Studio 16 2019' option.
+This can be worked around by either:
+ 1. Install Visual Studio 2017 Stable
+")
else()
+ if(NOT VCPKG_CMAKE_SYSTEM_NAME)
+ set(VCPKG_CMAKE_SYSTEM_NAME Windows)
+ endif()
message(FATAL_ERROR "Unable to determine appropriate generator for: ${VCPKG_CMAKE_SYSTEM_NAME}-${VCPKG_TARGET_ARCHITECTURE}-${VCPKG_PLATFORM_TOOLSET}")
endif()