Enable building with Visual Studio 2014 #77
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
|
tested locally on windows ec2, works (builds+all tests pass), merging. |
springmeyer
pushed a commit
that referenced
this pull request
Nov 14, 2014
Enable building with Visual Studio 2014
This was referenced Nov 14, 2014
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.
This makes two minor changes that will have no impact for normal usage.
But, if
--toolset=v140is passed then:msbuild_toolsetwill be set. An empty string means that whatever compiler default node-gyp has will be used. Because we pass--msvs_version=2013that is the default compiler (aka MSBuild "12"). But for Visual Studio 2014 builds we need MSBuild "14" andmsbuild_toolset="v140"triggers this. Once gyp officially supports visual studio 2014 and node-gyp updates to it then the default could be chosen through themsvs_versionflag. However until then the way to do this ismsbuild_toolset.gdal/v0.3.0/v140/<binary>directory. Note: if--toolsetis not passed then the double//will be collapsed and the standard path will be used as normal:gdal/v0.3.0/<binary>.After merging this we will need another quick tag. I'm happy to run this out.