[Cmake-commits] CMake branch, next, updated. v3.2.2-2828-g180c07e
Stephen Kelly
steveire at gmail.com
Sun May 17 06:34:48 EDT 2015
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 180c07e81352fb3117b5da2369ba4c5659f4481c (commit)
via 7603e184ebeb2c7f8f73a6ce44aa99223db461ce (commit)
via 05f39982078dfb0e97393b64a0f0cfde1b07ceae (commit)
from 6655d593788ce3ed12c5c6874e32baa58cd5fb92 (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=180c07e81352fb3117b5da2369ba4c5659f4481c
commit 180c07e81352fb3117b5da2369ba4c5659f4481c
Merge: 6655d59 7603e18
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun May 17 06:34:47 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun May 17 06:34:47 2015 -0400
Merge topic 'clean-up-vs-generators' into next
7603e184 fixup! VS: Move version information to global generator.
05f39982 fixup! VS: Simplify setting of flag table.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7603e184ebeb2c7f8f73a6ce44aa99223db461ce
commit 7603e184ebeb2c7f8f73a6ce44aa99223db461ce
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun May 17 12:24:58 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sun May 17 12:34:20 2015 +0200
fixup! VS: Move version information to global generator.
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index b74ba6f..a7d63d8 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -33,6 +33,13 @@ cmGlobalVisualStudioGenerator::~cmGlobalVisualStudioGenerator()
}
//----------------------------------------------------------------------------
+cmGlobalVisualStudioGenerator::VSVersion
+cmGlobalVisualStudioGenerator::GetVersion() const
+{
+ return this->Version;
+}
+
+//----------------------------------------------------------------------------
std::string cmGlobalVisualStudioGenerator::GetRegistryBase()
{
return cmGlobalVisualStudioGenerator::GetRegistryBase(
diff --git a/Source/cmGlobalVisualStudioGenerator.h b/Source/cmGlobalVisualStudioGenerator.h
index a504267..1946f91 100644
--- a/Source/cmGlobalVisualStudioGenerator.h
+++ b/Source/cmGlobalVisualStudioGenerator.h
@@ -41,6 +41,8 @@ public:
cmGlobalVisualStudioGenerator();
virtual ~cmGlobalVisualStudioGenerator();
+ VSVersion GetVersion() const;
+
/**
* Configure CMake's Visual Studio macros file into the user's Visual
* Studio macros directory.
@@ -122,6 +124,9 @@ protected:
typedef std::map<cmTarget const*, std::string> UtilityDependsMap;
UtilityDependsMap UtilityDepends;
+protected:
+ VSVersion Version;
+
private:
virtual std::string GetVSMakeProgram() = 0;
void PrintCompilerAdvice(std::ostream&, std::string const&,
@@ -134,8 +139,6 @@ private:
TargetSetMap TargetLinkClosure;
void FillLinkClosure(cmTarget const* target, TargetSet& linked);
TargetSet const& GetTargetLinkClosure(cmTarget* target);
-
- VSVersion Version;
};
class cmGlobalVisualStudioGenerator::OrderedTargetDependSet:
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 7dabccf..bc0a215 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -246,9 +246,9 @@ void cmLocalVisualStudio7Generator
this->WindowsCEProject = gg->TargetsWindowsCE();
// Intel Fortran for VS10 uses VS9 format ".vfproj" files.
- cmGlobalVisualStudioGenerator::VSVersion realVersion = this->GetVersion();
+ cmGlobalVisualStudioGenerator::VSVersion realVersion = gg->GetVersion();
if(this->FortranProject
- && this->GetVersion() >= cmGlobalVisualStudioGenerator::VS10)
+ && gg->GetVersion() >= cmGlobalVisualStudioGenerator::VS10)
{
gg->Version = cmGlobalVisualStudioGenerator::VS9;
}
@@ -2156,13 +2156,13 @@ cmLocalVisualStudio7Generator::WriteProjectStart(std::ostream& fout,
<< gg->Encoding() << "\"?>\n"
<< "<VisualStudioProject\n"
<< "\tProjectType=\"Visual C++\"\n";
- if(this->GetVersion() == cmGlobalVisualStudioGenerator::VS71)
+ if(gg->GetVersion() == cmGlobalVisualStudioGenerator::VS71)
{
fout << "\tVersion=\"7.10\"\n";
}
else
{
- fout << "\tVersion=\"" << (this->GetVersion()/10) << ".00\"\n";
+ fout << "\tVersion=\"" << (gg->GetVersion()/10) << ".00\"\n";
}
const char* projLabel = target.GetProperty("PROJECT_LABEL");
if(!projLabel)
@@ -2175,7 +2175,7 @@ cmLocalVisualStudio7Generator::WriteProjectStart(std::ostream& fout,
keyword = "Win32Proj";
}
fout << "\tName=\"" << projLabel << "\"\n";
- if(this->GetVersion() >= cmGlobalVisualStudioGenerator::VS8)
+ if(gg->GetVersion() >= cmGlobalVisualStudioGenerator::VS8)
{
fout << "\tProjectGUID=\"{" << gg->GetGUID(libName.c_str()) << "}\"\n";
}
diff --git a/Source/cmLocalVisualStudioGenerator.cxx b/Source/cmLocalVisualStudioGenerator.cxx
index 62c5c77..551783b 100644
--- a/Source/cmLocalVisualStudioGenerator.cxx
+++ b/Source/cmLocalVisualStudioGenerator.cxx
@@ -31,11 +31,12 @@ cmLocalVisualStudioGenerator::~cmLocalVisualStudioGenerator()
}
//----------------------------------------------------------------------------
+cmGlobalVisualStudioGenerator::VSVersion
cmLocalVisualStudioGenerator::GetVarsion() const
{
cmGlobalVisualStudioGenerator* gg =
static_cast<cmGlobalVisualStudioGenerator*>(this->GlobalGenerator);
- return gg->Version;
+ return gg->GetVersion();
}
//----------------------------------------------------------------------------
diff --git a/Source/cmLocalVisualStudioGenerator.h b/Source/cmLocalVisualStudioGenerator.h
index b48284f..df7d20c 100644
--- a/Source/cmLocalVisualStudioGenerator.h
+++ b/Source/cmLocalVisualStudioGenerator.h
@@ -13,6 +13,7 @@
#define cmLocalVisualStudioGenerator_h
#include "cmLocalGenerator.h"
+#include "cmGlobalVisualStudioGenerator.h"
#include <cmsys/auto_ptr.hxx>
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index 8427bf6..f60c410 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -20,7 +20,7 @@
#include "cmAlgorithms.h"
#if defined(_WIN32) && !defined(__CYGWIN__)
-# include "cmLocalVisualStudioGenerator.h"
+# include "cmGlobalVisualStudioGenerator.h"
#endif
#include <sys/stat.h>
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=05f39982078dfb0e97393b64a0f0cfde1b07ceae
commit 05f39982078dfb0e97393b64a0f0cfde1b07ceae
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun May 17 12:26:06 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sun May 17 12:34:20 2015 +0200
fixup! VS: Simplify setting of flag table.
diff --git a/Source/cmGlobalVisualStudio7Generator.h b/Source/cmGlobalVisualStudio7Generator.h
index ee0bf4f..204fdc8 100644
--- a/Source/cmGlobalVisualStudio7Generator.h
+++ b/Source/cmGlobalVisualStudio7Generator.h
@@ -111,7 +111,7 @@ public:
// Encoding for Visual Studio files
virtual std::string Encoding();
- cmVS7FlagTable const* ExtraFlagTable;
+ cmIDEFlagTable const* ExtraFlagTable;
protected:
virtual void Generate();
-----------------------------------------------------------------------
Summary of changes:
Source/cmGlobalVisualStudio7Generator.h | 2 +-
Source/cmGlobalVisualStudioGenerator.cxx | 7 +++++++
Source/cmGlobalVisualStudioGenerator.h | 7 +++++--
Source/cmLocalVisualStudio7Generator.cxx | 10 +++++-----
Source/cmLocalVisualStudioGenerator.cxx | 3 ++-
Source/cmLocalVisualStudioGenerator.h | 1 +
Source/cmQtAutoGenerators.cxx | 2 +-
7 files changed, 22 insertions(+), 10 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list