This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake".
The branch, next has been updated via f783bb19d369eb6e35bd1f11a93a86946ebea1d6 (commit) via aeebe90eb6f7e9d67825c3001e670c3ac5f54596 (commit) from 6050e2d50dc11ac8a9528ae04b27b486b27d7794 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f783bb19d369eb6e35bd1f11a93a86946ebea1d6 commit f783bb19d369eb6e35bd1f11a93a86946ebea1d6 Merge: 6050e2d aeebe90 Author: Robert Maynard <robert.mayn...@kitware.com> AuthorDate: Tue Aug 20 15:54:31 2013 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Tue Aug 20 15:54:31 2013 -0400 Merge topic 'vs2013_toolset_14369' into next aeebe90 VS: Update so the method is public. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aeebe90eb6f7e9d67825c3001e670c3ac5f54596 commit aeebe90eb6f7e9d67825c3001e670c3ac5f54596 Author: Robert Maynard <robert.mayn...@kitware.com> AuthorDate: Tue Aug 20 15:53:58 2013 -0400 Commit: Robert Maynard <robert.mayn...@kitware.com> CommitDate: Tue Aug 20 15:53:58 2013 -0400 VS: Update so the method is public. diff --git a/Source/cmGlobalVisualStudio10Generator.h b/Source/cmGlobalVisualStudio10Generator.h index f58524b..31e122e 100644 --- a/Source/cmGlobalVisualStudio10Generator.h +++ b/Source/cmGlobalVisualStudio10Generator.h @@ -81,9 +81,11 @@ public: void PathTooLong(cmTarget* target, cmSourceFile* sf, std::string const& sfRel); + + virtual const char* GetToolsVersion() { return "4.0"; } + protected: virtual const char* GetIDEVersion() { return "10.0"; } - virtual const char* GetToolsVersion() { return "4.0"; } std::string PlatformToolset; bool ExpressEdition; diff --git a/Source/cmGlobalVisualStudio12Generator.h b/Source/cmGlobalVisualStudio12Generator.h index c78c63c..8c8aeb1 100644 --- a/Source/cmGlobalVisualStudio12Generator.h +++ b/Source/cmGlobalVisualStudio12Generator.h @@ -31,12 +31,13 @@ public: /** TODO: VS 12 user macro support. */ virtual std::string GetUserMacrosDirectory() { return ""; } -protected: - virtual const char* GetIDEVersion() { return "12.0"; } + //in Visual Studio 2013 they detached the MSBuild tools version //from the .Net Framework version and instead made it have it's own //version number virtual const char* GetToolsVersion() { return "12.0"; } +protected: + virtual const char* GetIDEVersion() { return "12.0"; } private: class Factory; }; ----------------------------------------------------------------------- Summary of changes: Source/cmGlobalVisualStudio10Generator.h | 4 +++- Source/cmGlobalVisualStudio12Generator.h | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits