diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-11-21 21:47:51 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-21 21:47:51 -0800 |
| commit | f7c10858f71f7e03b8745cf561108b3e766e4e84 (patch) | |
| tree | d0eec8fb38dcc5e4604f0e9f355fc405ff2cf195 /scripts | |
| parent | 43fece81bddc25b2e560918873be9d8690b1374f (diff) | |
| parent | d5a7da6bcb92b551d6f8a9a321deb063f6632dbc (diff) | |
| download | vcpkg-f7c10858f71f7e03b8745cf561108b3e766e4e84.tar.gz vcpkg-f7c10858f71f7e03b8745cf561108b3e766e4e84.zip | |
Merge pull request #1752 from martin-s/patch-vs2013
Added support for VS2013 build chain tools.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/cmake/vcpkg_configure_cmake.cmake | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake index b979245aa..54616122c 100644 --- a/scripts/cmake/vcpkg_configure_cmake.cmake +++ b/scripts/cmake/vcpkg_configure_cmake.cmake @@ -61,6 +61,14 @@ function(vcpkg_configure_cmake) set(GENERATOR ${_csc_GENERATOR}) elseif(_csc_PREFER_NINJA AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" AND NOT _csc_HOST_ARCHITECTURE STREQUAL "x86") set(GENERATOR "Ninja") + + elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "x86" AND VCPKG_PLATFORM_TOOLSET MATCHES "v120") + set(GENERATOR "Visual Studio 12 2013") + elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "x64" AND VCPKG_PLATFORM_TOOLSET MATCHES "v120") + set(GENERATOR "Visual Studio 12 2013 Win64") + elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "arm" AND VCPKG_PLATFORM_TOOLSET MATCHES "v120") + set(GENERATOR "Visual Studio 12 2013 ARM") + elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" AND VCPKG_TARGET_ARCHITECTURE MATCHES "x86" AND VCPKG_PLATFORM_TOOLSET MATCHES "v140") set(GENERATOR "Visual Studio 14 2015") elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" AND VCPKG_TARGET_ARCHITECTURE MATCHES "x64" AND VCPKG_PLATFORM_TOOLSET MATCHES "v140") |