Repository: reef Updated Branches: refs/heads/master 07b60112d -> 061f66277
[REEF-743] Convert project files to Visual Studio 2015 This adds conditionals to `Org.Apache.REEF.Bridge.vcxproj` to switch the `PlatformToolset` based on the version of Visual Studio. This allows the same .sln to be compiled on Visual Studio 2013 and 2015. This also updates README.md with the build instructions for VS 2015 and Maven 3.3 or newer. JIRA: [REEF-743](https://issues.apache.org/jira/browse/REEF-743) Pull Request: This closes #873 Project: http://git-wip-us.apache.org/repos/asf/reef/repo Commit: http://git-wip-us.apache.org/repos/asf/reef/commit/061f6627 Tree: http://git-wip-us.apache.org/repos/asf/reef/tree/061f6627 Diff: http://git-wip-us.apache.org/repos/asf/reef/diff/061f6627 Branch: refs/heads/master Commit: 061f66277d760f8a67a460fa88e18a7b4dbf7543 Parents: 07b6011 Author: Markus Weimer <[email protected]> Authored: Thu Mar 3 10:20:38 2016 -0800 Committer: Mariia Mykhailova <[email protected]> Committed: Tue Mar 15 15:19:06 2016 -0700 ---------------------------------------------------------------------- README.md | 8 ++++---- .../Org.Apache.REEF.Bridge.vcxproj | 20 ++++++++++++++++++-- 2 files changed, 22 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/reef/blob/061f6627/README.md ---------------------------------------------------------------------- diff --git a/README.md b/README.md index a0078ee..ec8ad8a 100644 --- a/README.md +++ b/README.md @@ -30,13 +30,13 @@ Requirements ------------ * Java 7 Development Kit. - * [Apache Maven](http://maven.apache.org) 3 or newer. Make sure that + * [Apache Maven](http://maven.apache.org) 3.3 or newer. Make sure that `mvn` is in your `PATH`. * [Protocol Buffers](https://code.google.com/p/protobuf/) Compiler version 2.5. Make sure that `protoc` is on your `PATH`. - * For REEF.NET, you will also need [Visual Studio - 2013](http://www.visualstudio.com). Most REEF developers use the - free Community Edition. + * For REEF.NET, you will also need [Visual Studio] + (http://www.visualstudio.com), preferably Version 2015 (2013 is still + supported). Most REEF developers use the free Community Edition. REEF Java --------- http://git-wip-us.apache.org/repos/asf/reef/blob/061f6627/lang/cs/Org.Apache.REEF.Bridge/Org.Apache.REEF.Bridge.vcxproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Bridge/Org.Apache.REEF.Bridge.vcxproj b/lang/cs/Org.Apache.REEF.Bridge/Org.Apache.REEF.Bridge.vcxproj index c81c781..bae0bdd 100644 --- a/lang/cs/Org.Apache.REEF.Bridge/Org.Apache.REEF.Bridge.vcxproj +++ b/lang/cs/Org.Apache.REEF.Bridge/Org.Apache.REEF.Bridge.vcxproj @@ -43,15 +43,31 @@ under the License. <RootNamespace>Org.Apache.REEF.Bridge</RootNamespace> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <!-- + Switch the PlatformToolset based on the Visual Studio Version + --> + <PropertyGroup> + <!-- Assume Visual Studio 2015 / 14.0 as the default --> + <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion> + </PropertyGroup> + <!-- Visual Studio 2013 (12.0) --> + <PropertyGroup Condition="'$(VisualStudioVersion)' == '12.0'"> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <!-- Visual Studio 2015 (14.0) --> + <PropertyGroup Condition="'$(VisualStudioVersion)' == '14.0'"> + <PlatformToolset>v140</PlatformToolset> + </PropertyGroup> + <!-- + End of: Switch the PlatformToolset based on the Visual Studio Version + --> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v120</PlatformToolset> <CLRSupport>true</CLRSupport> <CharacterSet>Unicode</CharacterSet> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>v120</PlatformToolset> <CLRSupport>true</CLRSupport> <CharacterSet>Unicode</CharacterSet> <RestorePackages>true</RestorePackages>
