[Cmake-commits] CMake branch, next, updated. v3.2.2-3128-gfe0e213
Stephen Kelly
steveire at gmail.com
Mon May 25 03:01:28 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 fe0e213632010d053bbe2ad4772ececc33fe5632 (commit)
via 55b8af593d767272456c482cf80c9024155169ff (commit)
from 07b8f7177d24426144341429aa0b5d8e27e88c92 (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=fe0e213632010d053bbe2ad4772ececc33fe5632
commit fe0e213632010d053bbe2ad4772ececc33fe5632
Merge: 07b8f71 55b8af5
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon May 25 03:01:27 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon May 25 03:01:27 2015 -0400
Merge topic 'inject-state-snapshot' into next
55b8af59 Revert "cmState: Host some state from the cmGlobalGenerator."
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=55b8af593d767272456c482cf80c9024155169ff
commit 55b8af593d767272456c482cf80c9024155169ff
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon May 25 08:51:35 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Mon May 25 08:51:35 2015 +0200
Revert "cmState: Host some state from the cmGlobalGenerator."
This reverts commit 9e4247a1260df25e77e28ef0045cb96149fc9789.
diff --git a/Source/cmGlobalBorlandMakefileGenerator.cxx b/Source/cmGlobalBorlandMakefileGenerator.cxx
index 87665a0..f352d35 100644
--- a/Source/cmGlobalBorlandMakefileGenerator.cxx
+++ b/Source/cmGlobalBorlandMakefileGenerator.cxx
@@ -22,7 +22,7 @@ cmGlobalBorlandMakefileGenerator::cmGlobalBorlandMakefileGenerator(cmake* cm)
this->ForceUnixPaths = false;
this->ToolSupportsColor = true;
this->UseLinkScript = false;
- cm->GetState()->SetWindowsShell(true);
+ this->WindowsShell = true;
this->IncludeDirective = "!include";
this->DefineWindowsNULL = true;
this->PassMakeflags = true;
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index cd05c54..6f7ea79 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -72,6 +72,13 @@ cmGlobalGenerator::cmGlobalGenerator(cmake* cm)
this->ExtraGenerator = 0;
this->CurrentLocalGenerator = 0;
this->TryCompileOuterMakefile = 0;
+
+ this->WindowsShell = false;
+ this->WindowsVSIDE = false;
+ this->WatcomWMake = false;
+ this->MinGWMake = false;
+ this->NMake = false;
+ this->MSYSShell = false;
}
cmGlobalGenerator::~cmGlobalGenerator()
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index 979e971..58957bd 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -358,6 +358,13 @@ public:
#endif
std::string MakeSilentFlag;
+ bool WindowsShell;
+ bool WindowsVSIDE;
+ bool WatcomWMake;
+ bool MinGWMake;
+ bool NMake;
+ bool MSYSShell;
+
protected:
virtual void Generate();
diff --git a/Source/cmGlobalJOMMakefileGenerator.cxx b/Source/cmGlobalJOMMakefileGenerator.cxx
index 50e7053..e0e07c1 100644
--- a/Source/cmGlobalJOMMakefileGenerator.cxx
+++ b/Source/cmGlobalJOMMakefileGenerator.cxx
@@ -20,8 +20,8 @@ cmGlobalJOMMakefileGenerator::cmGlobalJOMMakefileGenerator(cmake* cm)
this->ForceUnixPaths = false;
this->ToolSupportsColor = true;
this->UseLinkScript = false;
- cm->GetState()->SetWindowsShell(true);
- cm->GetState()->SetNMake(true);
+ this->WindowsShell = true;
+ this->NMake = true;
this->DefineWindowsNULL = true;
this->PassMakeflags = true;
this->UnixCD = false;
diff --git a/Source/cmGlobalMSYSMakefileGenerator.cxx b/Source/cmGlobalMSYSMakefileGenerator.cxx
index a84923b..750fa5f 100644
--- a/Source/cmGlobalMSYSMakefileGenerator.cxx
+++ b/Source/cmGlobalMSYSMakefileGenerator.cxx
@@ -22,7 +22,7 @@ cmGlobalMSYSMakefileGenerator::cmGlobalMSYSMakefileGenerator(cmake* cm)
this->ForceUnixPaths = true;
this->ToolSupportsColor = true;
this->UseLinkScript = false;
- cm->GetState()->SetMSYSShell(true);
+ this->MSYSShell = true;
}
std::string
diff --git a/Source/cmGlobalMinGWMakefileGenerator.cxx b/Source/cmGlobalMinGWMakefileGenerator.cxx
index b6e52d7..999db84 100644
--- a/Source/cmGlobalMinGWMakefileGenerator.cxx
+++ b/Source/cmGlobalMinGWMakefileGenerator.cxx
@@ -20,8 +20,8 @@ cmGlobalMinGWMakefileGenerator::cmGlobalMinGWMakefileGenerator(cmake* cm)
this->ForceUnixPaths = true;
this->ToolSupportsColor = true;
this->UseLinkScript = true;
- cm->GetState()->SetWindowsShell(true);
- cm->GetState()->SetMinGWMake(true);
+ this->WindowsShell = true;
+ this->MinGWMake = true;
}
void cmGlobalMinGWMakefileGenerator
diff --git a/Source/cmGlobalNMakeMakefileGenerator.cxx b/Source/cmGlobalNMakeMakefileGenerator.cxx
index 4219c34..8f8d64e 100644
--- a/Source/cmGlobalNMakeMakefileGenerator.cxx
+++ b/Source/cmGlobalNMakeMakefileGenerator.cxx
@@ -20,8 +20,8 @@ cmGlobalNMakeMakefileGenerator::cmGlobalNMakeMakefileGenerator(cmake* cm)
this->ForceUnixPaths = false;
this->ToolSupportsColor = true;
this->UseLinkScript = false;
- cm->GetState()->SetWindowsShell(true);
- cm->GetState()->SetNMake(true);
+ this->WindowsShell = true;
+ this->NMake = true;
this->DefineWindowsNULL = true;
this->PassMakeflags = true;
this->UnixCD = false;
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index 10828e2..86037e3 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -517,7 +517,7 @@ cmGlobalNinjaGenerator::cmGlobalNinjaGenerator(cmake* cm)
, PolicyCMP0058(cmPolicies::WARN)
{
#ifdef _WIN32
- cm->GetState()->SetWindowsShell(true);
+ this->WindowsShell = true;
#endif
// // Ninja is not ported to non-Unix OS yet.
// this->ForceUnixPaths = true;
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index 585d19a..1cf990f 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -24,8 +24,8 @@
cmGlobalVisualStudioGenerator::cmGlobalVisualStudioGenerator(cmake* cm)
: cmGlobalGenerator(cm)
{
- cm->GetState()->SetWindowsShell(true);
- cm->GetState()->SetWindowsVSIDE(true);
+ this->WindowsShell = true;
+ this->WindowsVSIDE = true;
}
//----------------------------------------------------------------------------
diff --git a/Source/cmGlobalWatcomWMakeGenerator.cxx b/Source/cmGlobalWatcomWMakeGenerator.cxx
index 153773f..e76d783 100644
--- a/Source/cmGlobalWatcomWMakeGenerator.cxx
+++ b/Source/cmGlobalWatcomWMakeGenerator.cxx
@@ -24,9 +24,9 @@ cmGlobalWatcomWMakeGenerator::cmGlobalWatcomWMakeGenerator(cmake* cm)
this->NeedSymbolicMark = true;
this->EmptyRuleHackCommand = "@cd .";
#ifdef _WIN32
- cm->GetState()->SetWindowsShell(true);
+ this->WindowsShell = true;
#endif
- cm->GetState()->SetWatcomWMake(true);
+ this->WatcomWMake = true;
this->IncludeDirective = "!include";
this->DefineWindowsNULL = true;
this->UnixCD = false;
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 7d8596e..59f0443 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1176,7 +1176,7 @@ cmLocalGenerator::ConvertToOutputForExistingCommon(const std::string& remote,
// If this is a windows shell, the result has a space, and the path
// already exists, we can use a short-path to reference it without a
// space.
- if(this->GetState()->UseWindowsShell() && result.find(' ') != result.npos &&
+ if(this->GlobalGenerator->WindowsShell && result.find(' ') != result.npos &&
cmSystemTools::FileExists(remote.c_str()))
{
std::string tmp;
@@ -2548,7 +2548,7 @@ void cmLocalGenerator::JoinDefines(const std::set<std::string>& defines,
{
// Append the definition with proper escaping.
std::string def = dflag;
- if(this->GetState()->UseWatcomWMake())
+ if(this->GlobalGenerator->WatcomWMake)
{
// The Watcom compiler does its own command line parsing instead
// of using the windows shell rules. Definitions are one of
@@ -2718,7 +2718,7 @@ std::string cmLocalGenerator::ConvertToOutputFormat(const std::string& source,
// For the MSYS shell convert drive letters to posix paths, so
// that c:/some/path becomes /c/some/path. This is needed to
// avoid problems with the shell path translation.
- if(this->GetState()->UseMSYSShell() && !this->LinkScriptShell)
+ if(this->GlobalGenerator->MSYSShell && !this->LinkScriptShell)
{
if(result.size() > 2 && result[1] == ':')
{
@@ -2726,7 +2726,7 @@ std::string cmLocalGenerator::ConvertToOutputFormat(const std::string& source,
result[0] = '/';
}
}
- if(this->GetState()->UseWindowsShell())
+ if(this->GlobalGenerator->WindowsShell)
{
std::replace(result.begin(), result.end(), '/', '\\');
}
@@ -3141,22 +3141,22 @@ void cmLocalGenerator::ComputeObjectFilenames(
bool cmLocalGenerator::IsWindowsShell() const
{
- return this->GetState()->UseWindowsShell();
+ return this->GlobalGenerator->WindowsShell;
}
bool cmLocalGenerator::IsWatcomWMake() const
{
- return this->GetState()->UseWatcomWMake();
+ return this->GlobalGenerator->WatcomWMake;
}
bool cmLocalGenerator::IsMinGWMake() const
{
- return this->GetState()->UseMinGWMake();
+ return this->GlobalGenerator->MinGWMake;
}
bool cmLocalGenerator::IsNMake() const
{
- return this->GetState()->UseNMake();
+ return this->GlobalGenerator->NMake;
}
void cmLocalGenerator::SetConfiguredCMP0014(bool configured)
@@ -3307,7 +3307,7 @@ std::string cmLocalGenerator::EscapeForShell(const std::string& str,
// Compute the flags for the target shell environment.
int flags = 0;
- if(this->GetState()->UseWindowsVSIDE())
+ if(this->GlobalGenerator->WindowsVSIDE)
{
flags |= cmsysSystem_Shell_Flag_VSIDE;
}
@@ -3327,27 +3327,27 @@ std::string cmLocalGenerator::EscapeForShell(const std::string& str,
{
flags |= cmsysSystem_Shell_Flag_WatcomQuote;
}
- if(this->GetState()->UseWatcomWMake())
+ if(this->GlobalGenerator->WatcomWMake)
{
flags |= cmsysSystem_Shell_Flag_WatcomWMake;
}
- if(this->GetState()->UseMinGWMake())
+ if(this->GlobalGenerator->MinGWMake)
{
flags |= cmsysSystem_Shell_Flag_MinGWMake;
}
- if(this->GetState()->UseNMake())
+ if(this->GlobalGenerator->NMake)
{
flags |= cmsysSystem_Shell_Flag_NMake;
}
// Compute the buffer size needed.
- int size = (this->GetState()->UseWindowsShell() ?
+ int size = (this->GlobalGenerator->WindowsShell ?
cmsysSystem_Shell_GetArgumentSizeForWindows(str.c_str(), flags) :
cmsysSystem_Shell_GetArgumentSizeForUnix(str.c_str(), flags));
// Compute the shell argument itself.
std::vector<char> arg(size);
- if(this->GetState()->UseWindowsShell())
+ if(this->GlobalGenerator->WindowsShell)
{
cmsysSystem_Shell_GetArgumentForWindows(str.c_str(), &arg[0], flags);
}
diff --git a/Source/cmState.cxx b/Source/cmState.cxx
index 58885d3..1b14a92 100644
--- a/Source/cmState.cxx
+++ b/Source/cmState.cxx
@@ -20,13 +20,7 @@
cmState::cmState(cmake* cm)
: CMakeInstance(cm),
- IsInTryCompile(false),
- WindowsShell(false),
- WindowsVSIDE(false),
- WatcomWMake(false),
- MinGWMake(false),
- NMake(false),
- MSYSShell(false)
+ IsInTryCompile(false)
{
}
@@ -509,66 +503,6 @@ void cmState::SetBinaryDirectory(std::string const& binaryDirectory)
this->BinaryDirectoryComponents);
}
-void cmState::SetWindowsShell(bool windowsShell)
-{
- this->WindowsShell = windowsShell;
-}
-
-bool cmState::UseWindowsShell() const
-{
- return this->WindowsShell;
-}
-
-void cmState::SetWindowsVSIDE(bool windowsVSIDE)
-{
- this->WindowsVSIDE = windowsVSIDE;
-}
-
-bool cmState::UseWindowsVSIDE() const
-{
- return this->WindowsVSIDE;
-}
-
-void cmState::SetWatcomWMake(bool watcomWMake)
-{
- this->WatcomWMake = watcomWMake;
-}
-
-bool cmState::UseWatcomWMake() const
-{
- return this->WatcomWMake;
-}
-
-void cmState::SetMinGWMake(bool minGWMake)
-{
- this->MinGWMake = minGWMake;
-}
-
-bool cmState::UseMinGWMake() const
-{
- return this->MinGWMake;
-}
-
-void cmState::SetNMake(bool nMake)
-{
- this->NMake = nMake;
-}
-
-bool cmState::UseNMake() const
-{
- return this->NMake;
-}
-
-void cmState::SetMSYSShell(bool mSYSShell)
-{
- this->MSYSShell = mSYSShell;
-}
-
-bool cmState::UseMSYSShell() const
-{
- return this->MSYSShell;
-}
-
const char* cmState::GetBinaryDirectory() const
{
return this->BinaryDirectory.c_str();
diff --git a/Source/cmState.h b/Source/cmState.h
index 77a066f..424fe45 100644
--- a/Source/cmState.h
+++ b/Source/cmState.h
@@ -138,19 +138,6 @@ public:
std::vector<std::string> const& GetSourceDirectoryComponents() const;
std::vector<std::string> const& GetBinaryDirectoryComponents() const;
- void SetWindowsShell(bool windowsShell);
- bool UseWindowsShell() const;
- void SetWindowsVSIDE(bool windowsVSIDE);
- bool UseWindowsVSIDE() const;
- void SetWatcomWMake(bool watcomWMake);
- bool UseWatcomWMake() const;
- void SetMinGWMake(bool minGWMake);
- bool UseMinGWMake() const;
- void SetNMake(bool nMake);
- bool UseNMake() const;
- void SetMSYSShell(bool mSYSShell);
- bool UseMSYSShell() const;
-
private:
std::map<cmProperty::ScopeType, cmPropertyDefinitionMap> PropertyDefinitions;
std::vector<std::string> EnabledLanguages;
@@ -176,12 +163,6 @@ private:
std::string SourceDirectory;
std::string BinaryDirectory;
bool IsInTryCompile;
- bool WindowsShell;
- bool WindowsVSIDE;
- bool WatcomWMake;
- bool MinGWMake;
- bool NMake;
- bool MSYSShell;
};
#endif
-----------------------------------------------------------------------
Summary of changes:
Source/cmGlobalBorlandMakefileGenerator.cxx | 2 +-
Source/cmGlobalGenerator.cxx | 7 +++
Source/cmGlobalGenerator.h | 7 +++
Source/cmGlobalJOMMakefileGenerator.cxx | 4 +-
Source/cmGlobalMSYSMakefileGenerator.cxx | 2 +-
Source/cmGlobalMinGWMakefileGenerator.cxx | 4 +-
Source/cmGlobalNMakeMakefileGenerator.cxx | 4 +-
Source/cmGlobalNinjaGenerator.cxx | 2 +-
Source/cmGlobalVisualStudioGenerator.cxx | 4 +-
Source/cmGlobalWatcomWMakeGenerator.cxx | 4 +-
Source/cmLocalGenerator.cxx | 28 +++++------
Source/cmState.cxx | 68 +--------------------------
Source/cmState.h | 19 --------
13 files changed, 42 insertions(+), 113 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list