diff options
| author | kiwixz <kiwixz@outlook.com> | 2019-03-16 17:40:31 +0100 |
|---|---|---|
| committer | kiwixz <kiwixz@outlook.com> | 2019-03-16 17:40:31 +0100 |
| commit | b755c30bc7f4a48db344eb1a25873e56b31925c0 (patch) | |
| tree | 312365aa516e673f0f9ccd62a05d3c407556371c /scripts/cmake | |
| parent | d7bf0e581942fca27ef9bf79c6684c8d19ae1967 (diff) | |
| download | vcpkg-b755c30bc7f4a48db344eb1a25873e56b31925c0.tar.gz vcpkg-b755c30bc7f4a48db344eb1a25873e56b31925c0.zip | |
update to cmake 3.14 (allow VS2019RC)
Diffstat (limited to 'scripts/cmake')
| -rw-r--r-- | scripts/cmake/vcpkg_configure_cmake.cmake | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake index 584e93251..83acf1bae 100644 --- a/scripts/cmake/vcpkg_configure_cmake.cmake +++ b/scripts/cmake/vcpkg_configure_cmake.cmake @@ -109,16 +109,11 @@ 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 -") + set(GENERATOR "Visual Studio 16 2019") + set(ARCH "${VCPKG_TARGET_ARCHITECTURE}") + else() if(NOT VCPKG_CMAKE_SYSTEM_NAME) set(VCPKG_CMAKE_SYSTEM_NAME Windows) |