Skip to content

Commit

Permalink
CPP-449: Adding Visual Studio 2017 to automated build script
Browse files Browse the repository at this point in the history
This reverts commit a6da80e while also
fixing an issue with targeted compilers. If a compiler was missing the
`--TARGET-COMPILER` argument could choose the wrong selection entry due
to the indexes being split out for the modern and legacy Visual Studio
checks.
  • Loading branch information
Michael Fero committed Sep 21, 2017
1 parent dd281f1 commit 2f485f2
Show file tree
Hide file tree
Showing 4 changed files with 222 additions and 209 deletions.
33 changes: 20 additions & 13 deletions appveyor.yml
Expand Up @@ -6,14 +6,14 @@ skip_tags: true
shallow_clone: true
cache:
- C:\projects\dependencies\libs -> appveyor.yml
os: Visual Studio 2015
platform:
- x86
- x64
configuration:
# - Debug
- Release
environment:
appveyor_build_worker_cloud: gce
BOOST_FILENAME_VERSION: 1_64_0
BOOST_VERSION: 1.64.0
LIBSSH2_VERSION: 1.8.0
Expand All @@ -24,18 +24,26 @@ environment:
DEPENDENCIES_LOCATION_PREFIX: C:/projects/dependencies/libs
CONFIGURATION_COMPLETE: False
matrix:
- CMAKE_GENERATOR: Visual Studio 14 2015
VISUAL_STUDIO_INTERNAL_VERSION: 140
VISUAL_STUDIO_VERSION: 14.0
- CMAKE_GENERATOR: Visual Studio 12 2013
VISUAL_STUDIO_INTERNAL_VERSION: 120
VISUAL_STUDIO_VERSION: 12.0
- CMAKE_GENERATOR: Visual Studio 11 2012
VISUAL_STUDIO_INTERNAL_VERSION: 110
VISUAL_STUDIO_VERSION: 11.0
- CMAKE_GENERATOR: Visual Studio 10 2010
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
CMAKE_GENERATOR: Visual Studio 10 2010
VISUAL_STUDIO_INTERNAL_VERSION: 100
VISUAL_STUDIO_VERSION: 10.0
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
CMAKE_GENERATOR: Visual Studio 11 2012
VISUAL_STUDIO_INTERNAL_VERSION: 110
VISUAL_STUDIO_VERSION: 11.0
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
CMAKE_GENERATOR: Visual Studio 12 2013
VISUAL_STUDIO_INTERNAL_VERSION: 120
VISUAL_STUDIO_VERSION: 12.0
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
CMAKE_GENERATOR: Visual Studio 14 2015
VISUAL_STUDIO_INTERNAL_VERSION: 140
VISUAL_STUDIO_VERSION: 14.0
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
CMAKE_GENERATOR: Visual Studio 15 2017
VISUAL_STUDIO_INTERNAL_VERSION: 141
VISUAL_STUDIO_VERSION: 14.1

init:
- ps: |
Expand Down Expand Up @@ -238,7 +246,6 @@ on_finish:
$host.SetShouldExit(1)
}
}
on_failure:
- ps: |
# Write the CMake output and error logs to the console
Expand All @@ -247,7 +254,7 @@ on_failure:
Write-Output "CMakeOutput.log"
cat build/CMakeFiles/CMakeOutput.log
}
If (Test-Path builds/CMakeFiles/CMakeError.log) {
If (Test-Path build/CMakeFiles/CMakeError.log) {
Write-Output "CMakeError.log"
cat build/CMakeFiles/CMakeError.log
}
Expand Down
10 changes: 10 additions & 0 deletions bin/README.md
@@ -0,0 +1,10 @@
# Binary Utilities

## Windows

* [Visual Studio Locator][vswhere] (e.g. VSWHERE) v2.1.3
Over the years Visual Studio could be discovered using registry keys, but with recent changes to the deployment and extensibility models a new method is needed to discover possibly more than once installed instance. These changes facilitate a smaller, faster default install complimented by on-demand install of other workloads and components.
* This binary utility is licensed under the [MIT license][vswhere-license].

[vswhere]: https://github.com/Microsoft/vswhere
[vswhere-license]: https://github.com/Microsoft/vswhere/blob/2.1.3/LICENSE.txt
Binary file added bin/vswhere.exe
Binary file not shown.

0 comments on commit 2f485f2

Please sign in to comment.