Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Enable building with Visual Studio 2014 #77

Merged
merged 5 commits into from
Nov 14, 2014
Merged

Enable building with Visual Studio 2014 #77

merged 5 commits into from
Nov 14, 2014

Conversation

springmeyer
Copy link
Collaborator

This makes two minor changes that will have no impact for normal usage.

But, if --toolset=v140 is passed then:

  • Then the msbuild_toolset will be set. An empty string means that whatever compiler default node-gyp has will be used. Because we pass --msvs_version=2013 that is the default compiler (aka MSBuild "12"). But for Visual Studio 2014 builds we need MSBuild "14" and msbuild_toolset="v140" triggers this. Once gyp officially supports visual studio 2014 and node-gyp updates to it then the default could be chosen through the msvs_version flag. However until then the way to do this is msbuild_toolset.
  • Also node-pre-gyp 0.6.x will understand this option and published builds will go into a remote directory like gdal/v0.3.0/v140/<binary> directory. Note: if --toolset is 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.

@springmeyer
Copy link
Collaborator Author

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
@springmeyer springmeyer merged commit f5eb2c0 into master Nov 14, 2014
@springmeyer springmeyer deleted the vs2014 branch November 14, 2014 07:47
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant