diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-01-24 18:55:41 -0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-01-24 18:55:41 -0800 |
| commit | 318d32e870f8ee25bdf71c8012115ebb9bc38361 (patch) | |
| tree | 0c91f58e5f6352a3cd9927173d9d3578d588f5af /scripts/cmake | |
| parent | 7fe735c02e37057596396d42b17caef3169415b0 (diff) | |
| download | vcpkg-318d32e870f8ee25bdf71c8012115ebb9bc38361.tar.gz vcpkg-318d32e870f8ee25bdf71c8012115ebb9bc38361.zip | |
[vcpkg] Add user-facing notification to prompt rebuilding vcpkg.exe in face of cmake changes.
Diffstat (limited to 'scripts/cmake')
| -rw-r--r-- | scripts/cmake/vcpkg_configure_cmake.cmake | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake index 128782075..5db9b5d05 100644 --- a/scripts/cmake/vcpkg_configure_cmake.cmake +++ b/scripts/cmake/vcpkg_configure_cmake.cmake @@ -2,6 +2,10 @@ find_program(vcpkg_configure_cmake_NINJA ninja) function(vcpkg_configure_cmake) cmake_parse_arguments(_csc "" "SOURCE_PATH;GENERATOR" "OPTIONS;OPTIONS_DEBUG;OPTIONS_RELEASE" ${ARGN}) + if(NOT VCPKG_PLATFORM_TOOLSET) + message(FATAL_ERROR "Vcpkg has been updated with VS2017 support, however you need to rebuild vcpkg.exe by re-running bootstrap.ps1\n powershell -exec bypass scripts\\bootstrap.ps1\n") + endif() + if(_csc_GENERATOR) set(GENERATOR ${_csc_GENERATOR}) elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" AND TRIPLET_SYSTEM_ARCH MATCHES "x86" AND VCPKG_PLATFORM_TOOLSET MATCHES "v140") |