add support for VS 2017 #307
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Hi @barcharcraz, I'm your friendly neighborhood Microsoft Pull Request Bot (You can call me MSBOT). Thanks for your contribution! The agreement was validated by Microsoft and real humans are currently evaluating your PR. TTYL, MSBOT; |
|
Looks great, thanks! |
Orvid
reviewed
Nov 21, 2016
| @@ -12,6 +12,12 @@ if(NOT VCPKG_TOOLCHAIN) | |||
| set(_VCPKG_TARGET_TRIPLET_ARCH arm) | |||
| elseif(CMAKE_GENERATOR MATCHES "^Visual Studio 14 2015$") | |||
| set(_VCPKG_TARGET_TRIPLET_ARCH x86) | |||
| elseif(CMAKE_GENERATOR MATCHES "^Visual Studio 15 2017 Win64$") | |||
There was a problem hiding this comment.
The official CMake 3.7 release doesn't include the " 2017" as part of the generator name. This should also probably be merged with the case above, making the final regex for the Win64 case:
^Visual Studio 1(4 2015|5( 2017)?) Win64$
There was a problem hiding this comment.
This is true, I'll add it as a totally separate line in a new PR.
ras0219-msft
pushed a commit
that referenced
this pull request
Feb 21, 2021
* Issue #307 * Update baseline
dempo93
pushed a commit
to dempo93/vcpkg
that referenced
this pull request
Aug 23, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
the version of cmake shipped with VS2017 has a new generator for vs2017, this will probably be the final name as well.
to use this in VS2017 simply add -DCMAKE_TOOLCHAIN_FILE=c:\... to the cmakeCommandArgs option in the json settings file. If it's the first option you MUST add a leading space to the JSON string.