[Cmake-commits] CMake branch, next, updated. v2.8.12-4954-g9f629d9
Peter Kuemmel
syntheticpp at gmx.net
Tue Nov 5 17:08:21 EST 2013
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 9f629d9c379cd22c339377f43837cc93d6ffe541 (commit)
via 9ff69f7e54df09205224221aae791aca752f0941 (commit)
from 78d8787d390be520f5bbd801ce7703864256b31e (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=9f629d9c379cd22c339377f43837cc93d6ffe541
commit 9f629d9c379cd22c339377f43837cc93d6ffe541
Merge: 78d8787 9ff69f7
Author: Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Tue Nov 5 17:08:17 2013 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 5 17:08:17 2013 -0500
Merge topic 'ninja-experimental-pool-support' into next
9ff69f7 Revert "Ninja: add pool support"
diff --cc Help/manual/cmake-properties.7.rst
index c5c1a81,d6d42ad..e3a4cf8
--- a/Help/manual/cmake-properties.7.rst
+++ b/Help/manual/cmake-properties.7.rst
@@@ -97,12 -96,8 +96,11 @@@ Properties on Target
/prop_tgt/COMPILE_DEFINITIONS
/prop_tgt/COMPILE_FLAGS
/prop_tgt/COMPILE_OPTIONS
+ /prop_tgt/COMPILE_FEATURES
/prop_tgt/CONFIG_OUTPUT_NAME
- /prop_tgt/COMPILE_POOL
/prop_tgt/CONFIG_POSTFIX
+ /prop_tgt/CXX_STANDARD
+ /prop_tgt/CXX_EXTENSIONS
/prop_tgt/DEBUG_POSTFIX
/prop_tgt/DEFINE_SYMBOL
/prop_tgt/EchoString
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9ff69f7e54df09205224221aae791aca752f0941
commit 9ff69f7e54df09205224221aae791aca752f0941
Author: Peter Kümmel <syntheticpp at gmx.net>
AuthorDate: Tue Nov 5 23:07:46 2013 +0100
Commit: Peter Kümmel <syntheticpp at gmx.net>
CommitDate: Tue Nov 5 23:07:46 2013 +0100
Revert "Ninja: add pool support"
This reverts commit 6890cecb80b015edccb78a3fbde6addc74e6562d.
diff --git a/Help/manual/cmake-properties.7.rst b/Help/manual/cmake-properties.7.rst
index cab5b4a..d6d42ad 100644
--- a/Help/manual/cmake-properties.7.rst
+++ b/Help/manual/cmake-properties.7.rst
@@ -27,7 +27,6 @@ Properties of Global Scope
/prop_gbl/IN_TRY_COMPILE
/prop_gbl/PACKAGES_FOUND
/prop_gbl/PACKAGES_NOT_FOUND
- /prop_gbl/POOLS
/prop_gbl/PREDEFINED_TARGETS_FOLDER
/prop_gbl/REPORT_UNDEFINED_PROPERTIES
/prop_gbl/RULE_LAUNCH_COMPILE
@@ -98,7 +97,6 @@ Properties on Targets
/prop_tgt/COMPILE_FLAGS
/prop_tgt/COMPILE_OPTIONS
/prop_tgt/CONFIG_OUTPUT_NAME
- /prop_tgt/COMPILE_POOL
/prop_tgt/CONFIG_POSTFIX
/prop_tgt/DEBUG_POSTFIX
/prop_tgt/DEFINE_SYMBOL
@@ -164,7 +162,6 @@ Properties on Targets
/prop_tgt/LINK_INTERFACE_MULTIPLICITY_CONFIG
/prop_tgt/LINK_INTERFACE_MULTIPLICITY
/prop_tgt/LINK_LIBRARIES
- /prop_tgt/LINK_POOL
/prop_tgt/LINK_SEARCH_END_STATIC
/prop_tgt/LINK_SEARCH_START_STATIC
/prop_tgt/LOCATION_CONFIG
diff --git a/Help/prop_gbl/POOLS.rst b/Help/prop_gbl/POOLS.rst
deleted file mode 100644
index 52782cb..0000000
--- a/Help/prop_gbl/POOLS.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-POOLS
------
-
-Ninja only: List of pools to use
-
-A pool is a named integer property and defines the maximum number
-of concurrent jobs which can be started by a rule assigned to the pool.
-The POOLS property is a semicolon-separated list of pairs using
-the syntax NAME=integer.
diff --git a/Help/prop_tgt/COMPILE_POOL.rst b/Help/prop_tgt/COMPILE_POOL.rst
deleted file mode 100644
index 9e1fa5e..0000000
--- a/Help/prop_tgt/COMPILE_POOL.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-COMPILE_POOL
-------------
-
-Ninja only: Pool which should be used when compiling sources
-
-The number of parallel compile process could be limited by setting
-the global POOLS property and specifing here the pool name.
diff --git a/Help/prop_tgt/LINK_POOL.rst b/Help/prop_tgt/LINK_POOL.rst
deleted file mode 100644
index ba26d50..0000000
--- a/Help/prop_tgt/LINK_POOL.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-LINK_POOL
----------
-
-Ninja only: Pool which should be used when linking the target
-
-The number of parallel link process could be limited by setting
-the global POOLS property and specifing here the pool name.
diff --git a/Source/cmAddCustomCommandCommand.cxx b/Source/cmAddCustomCommandCommand.cxx
index 1275562..5634849 100644
--- a/Source/cmAddCustomCommandCommand.cxx
+++ b/Source/cmAddCustomCommandCommand.cxx
@@ -31,7 +31,6 @@ bool cmAddCustomCommandCommand
std::string source, target, main_dependency, working;
std::string comment_buffer;
- std::string pool;
const char* comment = 0;
std::vector<std::string> depends, outputs, output;
bool verbatim = false;
@@ -59,7 +58,6 @@ bool cmAddCustomCommandCommand
doing_outputs,
doing_comment,
doing_working_directory,
- doing_pool,
doing_nothing
};
@@ -140,10 +138,6 @@ bool cmAddCustomCommandCommand
{
doing = doing_comment;
}
- else if (copy == "POOL")
- {
- doing = doing_pool;
- }
else
{
std::string filename;
@@ -234,9 +228,6 @@ bool cmAddCustomCommandCommand
comment_buffer = copy;
comment = comment_buffer.c_str();
break;
- case doing_pool:
- pool = copy;
- break;
default:
this->SetError("Wrong syntax. Unknown type of argument.");
return false;
@@ -326,8 +317,7 @@ bool cmAddCustomCommandCommand
main_dependency.c_str(),
commandLines, comment,
working.c_str(), false,
- escapeOldStyle,
- pool.c_str());
+ escapeOldStyle);
// Add implicit dependency scanning requests if any were given.
if(!implicit_depends.empty())
diff --git a/Source/cmAddCustomCommandCommand.h b/Source/cmAddCustomCommandCommand.h
index b0645ca..114957f 100644
--- a/Source/cmAddCustomCommandCommand.h
+++ b/Source/cmAddCustomCommandCommand.h
@@ -44,7 +44,6 @@ public:
virtual const char* GetName() const {return "add_custom_command";}
cmTypeMacro(cmAddCustomCommandCommand, cmCommand);
-
protected:
bool CheckOutputs(const std::vector<std::string>& outputs);
};
diff --git a/Source/cmCustomCommand.cxx b/Source/cmCustomCommand.cxx
index 86003c8..3620a38 100644
--- a/Source/cmCustomCommand.cxx
+++ b/Source/cmCustomCommand.cxx
@@ -31,7 +31,6 @@ cmCustomCommand::cmCustomCommand(const cmCustomCommand& r):
HaveComment(r.HaveComment),
Comment(r.Comment),
WorkingDirectory(r.WorkingDirectory),
- Pool(r.Pool),
EscapeAllowMakeVars(r.EscapeAllowMakeVars),
EscapeOldStyle(r.EscapeOldStyle),
Backtrace(new cmListFileBacktrace(*r.Backtrace))
@@ -70,15 +69,13 @@ cmCustomCommand::cmCustomCommand(cmMakefile* mf,
const std::vector<std::string>& depends,
const cmCustomCommandLines& commandLines,
const char* comment,
- const char* workingDirectory,
- const char* pool):
+ const char* workingDirectory):
Outputs(outputs),
Depends(depends),
CommandLines(commandLines),
HaveComment(comment?true:false),
Comment(comment?comment:""),
WorkingDirectory(workingDirectory?workingDirectory:""),
- Pool(pool?pool:""),
EscapeAllowMakeVars(false),
EscapeOldStyle(true),
Backtrace(new cmListFileBacktrace)
@@ -133,12 +130,6 @@ const char* cmCustomCommand::GetComment() const
}
//----------------------------------------------------------------------------
-std::string cmCustomCommand::GetPool() const
-{
- return this->Pool;
-}
-
-//----------------------------------------------------------------------------
void cmCustomCommand::AppendCommands(const cmCustomCommandLines& commandLines)
{
for(cmCustomCommandLines::const_iterator i=commandLines.begin();
diff --git a/Source/cmCustomCommand.h b/Source/cmCustomCommand.h
index cbc4c57..e20d2bf 100644
--- a/Source/cmCustomCommand.h
+++ b/Source/cmCustomCommand.h
@@ -35,8 +35,7 @@ public:
const std::vector<std::string>& depends,
const cmCustomCommandLines& commandLines,
const char* comment,
- const char* workingDirectory,
- const char* pool);
+ const char* workingDirectory);
~cmCustomCommand();
@@ -55,9 +54,6 @@ public:
/** Get the comment string for the command. */
const char* GetComment() const;
- /** Get the pool name for the command. */
- std::string GetPool() const;
-
/** Append to the list of command lines. */
void AppendCommands(const cmCustomCommandLines& commandLines);
@@ -89,7 +85,6 @@ private:
bool HaveComment;
std::string Comment;
std::string WorkingDirectory;
- std::string Pool;
bool EscapeAllowMakeVars;
bool EscapeOldStyle;
cmListFileBacktrace* Backtrace;
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 551cb6d..dd7311e 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -2384,7 +2384,7 @@ cmTarget cmGlobalGenerator::CreateGlobalTarget(
std::vector<std::string> no_depends;
// Store the custom command in the target.
cmCustomCommand cc(0, no_outputs, no_depends, *commandLines, 0,
- workingDirectory, 0);
+ workingDirectory);
target.GetPostBuildCommands().push_back(cc);
target.SetProperty("EchoString", message);
std::vector<std::string>::iterator dit;
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index a4d0e02..d262397 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -256,8 +256,7 @@ cmGlobalNinjaGenerator::WriteCustomCommandBuild(const std::string& command,
const std::string& comment,
const cmNinjaDeps& outputs,
const cmNinjaDeps& deps,
- const cmNinjaDeps& orderOnly,
- const std::string& pool)
+ const cmNinjaDeps& orderOnly)
{
std::string cmd = command;
#ifdef _WIN32
@@ -271,8 +270,6 @@ cmGlobalNinjaGenerator::WriteCustomCommandBuild(const std::string& command,
cmNinjaVars vars;
vars["COMMAND"] = cmd;
vars["DESC"] = EncodeLiteral(description);
- if (!pool.empty())
- vars["pool"] = pool;
this->WriteBuild(*this->BuildFileStream,
comment,
diff --git a/Source/cmGlobalNinjaGenerator.h b/Source/cmGlobalNinjaGenerator.h
index 1a2a3d5..be58df1 100644
--- a/Source/cmGlobalNinjaGenerator.h
+++ b/Source/cmGlobalNinjaGenerator.h
@@ -105,9 +105,7 @@ public:
const std::string& comment,
const cmNinjaDeps& outputs,
const cmNinjaDeps& deps = cmNinjaDeps(),
- const cmNinjaDeps& orderOnly = cmNinjaDeps(),
- const std::string& pool = std::string());
-
+ const cmNinjaDeps& orderOnly = cmNinjaDeps());
void WriteMacOSXContentBuild(const std::string& input,
const std::string& output);
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 1046696..13ed143 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1363,7 +1363,7 @@ void cmGlobalXCodeGenerator::CreateCustomCommands(cmXCodeObject* buildPhases,
std::vector<std::string>(),
cmd,
"Creating symlinks",
- "", 0);
+ "");
postbuild.push_back(command);
}
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx
index a8abb33..f1d5e2c 100644
--- a/Source/cmLocalNinjaGenerator.cxx
+++ b/Source/cmLocalNinjaGenerator.cxx
@@ -183,7 +183,6 @@ void cmLocalNinjaGenerator::WriteBuildFileTop()
// For the rule file.
this->WriteProjectHeader(this->GetRulesFileStream());
- this->WritePools(this->GetRulesFileStream());
}
void cmLocalNinjaGenerator::WriteProjectHeader(std::ostream& os)
@@ -196,32 +195,6 @@ void cmLocalNinjaGenerator::WriteProjectHeader(std::ostream& os)
cmGlobalNinjaGenerator::WriteDivider(os);
}
-void cmLocalNinjaGenerator::WritePools(std::ostream& os)
-{
- cmGlobalNinjaGenerator::WriteDivider(os);
-
- const char* poolsStr = this->GetCMakeInstance()->
- GetProperty("POOLS", cmProperty::GLOBAL);
- if (poolsStr)
- {
- std::vector<std::string> pools;
- cmSystemTools::ExpandListArgument(poolsStr, pools);
- for (size_t i = 0; i < pools.size(); ++i)
- {
- const std::string pool = pools[i];
- std::string::size_type eq = pool.find("=");
- if (eq != std::string::npos && pool.size() > eq)
- {
- os << "pool " << pool.substr(0, eq) << std::endl;
- os << " depth = " << pool.substr(eq + 1) << std::endl;
- os << std::endl;
- }
- }
- }
-
- cmGlobalNinjaGenerator::WriteDivider(os);
-}
-
void cmLocalNinjaGenerator::WriteNinjaFilesInclusion(std::ostream& os)
{
cmGlobalNinjaGenerator::WriteDivider(os);
@@ -395,8 +368,7 @@ cmLocalNinjaGenerator::WriteCustomCommandBuildStatement(
"Custom command for " + ninjaOutputs[0],
ninjaOutputs,
ninjaDeps,
- orderOnlyDeps,
- cc->GetPool());
+ orderOnlyDeps);
}
}
diff --git a/Source/cmLocalNinjaGenerator.h b/Source/cmLocalNinjaGenerator.h
index ea854c6..8eb63c5 100644
--- a/Source/cmLocalNinjaGenerator.h
+++ b/Source/cmLocalNinjaGenerator.h
@@ -112,7 +112,6 @@ private:
void WriteProjectHeader(std::ostream& os);
void WriteNinjaFilesInclusion(std::ostream& os);
void WriteProcessedMakefile(std::ostream& os);
- void WritePools(std::ostream& os);
void SetConfigName();
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index b352450..a665b93 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -805,7 +805,7 @@ cmLocalVisualStudio6Generator::MaybeCreateOutputDir(cmTarget& target,
std::vector<std::string> no_depends;
cmCustomCommandLines commands;
commands.push_back(command);
- pcc.reset(new cmCustomCommand(0, no_output, no_depends, commands, 0, 0, 0));
+ pcc.reset(new cmCustomCommand(0, no_output, no_depends, commands, 0, 0));
pcc->SetEscapeOldStyle(false);
pcc->SetEscapeAllowMakeVars(true);
return pcc;
diff --git a/Source/cmLocalVisualStudioGenerator.cxx b/Source/cmLocalVisualStudioGenerator.cxx
index 08daaac..ef2bb1d 100644
--- a/Source/cmLocalVisualStudioGenerator.cxx
+++ b/Source/cmLocalVisualStudioGenerator.cxx
@@ -58,7 +58,7 @@ cmLocalVisualStudioGenerator::MaybeCreateImplibDir(cmTarget& target,
std::vector<std::string> no_depends;
cmCustomCommandLines commands;
commands.push_back(command);
- pcc.reset(new cmCustomCommand(0, no_output, no_depends, commands, 0, 0, 0));
+ pcc.reset(new cmCustomCommand(0, no_output, no_depends, commands, 0, 0));
pcc->SetEscapeOldStyle(false);
pcc->SetEscapeAllowMakeVars(true);
return pcc;
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 30c8d09..c18a7eb 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -897,7 +897,7 @@ cmMakefile::AddCustomCommandToTarget(const char* target,
// Add the command to the appropriate build step for the target.
std::vector<std::string> no_output;
cmCustomCommand cc(this, no_output, depends,
- commandLines, comment, workingDir, 0);
+ commandLines, comment, workingDir);
cc.SetEscapeOldStyle(escapeOldStyle);
cc.SetEscapeAllowMakeVars(true);
switch(type)
@@ -924,8 +924,7 @@ cmMakefile::AddCustomCommandToOutput(const std::vector<std::string>& outputs,
const char* comment,
const char* workingDir,
bool replace,
- bool escapeOldStyle,
- const char* pool)
+ bool escapeOldStyle)
{
// Make sure there is at least one output.
if(outputs.empty())
@@ -1028,7 +1027,7 @@ cmMakefile::AddCustomCommandToOutput(const std::vector<std::string>& outputs,
{
cmCustomCommand* cc =
new cmCustomCommand(this, outputs, depends2, commandLines,
- comment, workingDir, pool);
+ comment, workingDir);
cc->SetEscapeOldStyle(escapeOldStyle);
cc->SetEscapeAllowMakeVars(true);
file->SetCustomCommand(cc);
@@ -1079,14 +1078,13 @@ cmMakefile::AddCustomCommandToOutput(const char* output,
const char* comment,
const char* workingDir,
bool replace,
- bool escapeOldStyle,
- const char* pool)
+ bool escapeOldStyle)
{
std::vector<std::string> outputs;
outputs.push_back(output);
return this->AddCustomCommandToOutput(outputs, depends, main_dependency,
commandLines, comment, workingDir,
- replace, escapeOldStyle, pool);
+ replace, escapeOldStyle);
}
//----------------------------------------------------------------------------
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 94a5956..76958ca 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -174,7 +174,6 @@ public:
cmTarget::CustomCommandType type,
const char* comment, const char* workingDir,
bool escapeOldStyle = true);
-
cmSourceFile* AddCustomCommandToOutput(
const std::vector<std::string>& outputs,
const std::vector<std::string>& depends,
@@ -182,18 +181,15 @@ public:
const cmCustomCommandLines& commandLines,
const char* comment, const char* workingDir,
bool replace = false,
- bool escapeOldStyle = true,
- const char *pool = 0);
-
- cmSourceFile* AddCustomCommandToOutput(const char* output,
+ bool escapeOldStyle = true);
+ cmSourceFile* AddCustomCommandToOutput(
+ const char* output,
const std::vector<std::string>& depends,
const char* main_dependency,
const cmCustomCommandLines& commandLines,
const char* comment, const char* workingDir,
bool replace = false,
- bool escapeOldStyle = true,
- const char* pool = 0);
-
+ bool escapeOldStyle = true);
void AddCustomCommandOldStyle(const char* target,
const std::vector<std::string>& outputs,
const std::vector<std::string>& depends,
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index 6e3bc47..015654b 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -455,17 +455,12 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
std::string frameworkPath;
std::string linkPath;
- cmGeneratorTarget* target = this->GetGeneratorTarget();
this->GetLocalGenerator()->GetTargetFlags(vars["LINK_LIBRARIES"],
vars["FLAGS"],
vars["LINK_FLAGS"],
frameworkPath,
linkPath,
- target);
-
- const char* pool = target->GetProperty("LINK_POOL");
- if (pool)
- vars["pool"] = pool;
+ this->GetGeneratorTarget());
this->AddModuleDefinitionFlag(vars["LINK_FLAGS"]);
vars["LINK_FLAGS"] = cmGlobalNinjaGenerator
@@ -480,7 +475,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
? vars["FLAGS"]
: vars["ARCH_FLAGS"]);
this->GetLocalGenerator()->AddArchitectureFlags(flags,
- target,
+ this->GetGeneratorTarget(),
this->TargetLinkLanguage,
this->GetConfigName());
if (targetType == cmTarget::EXECUTABLE) {
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index 8714be8..26eadbe 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -568,22 +568,10 @@ cmNinjaTargetGenerator
EnsureParentDirectoryExists(objectFileName);
std::string objectDir = cmSystemTools::GetFilenamePath(objectFileName);
-
vars["OBJECT_DIR"] = this->GetLocalGenerator()->ConvertToOutputFormat(
ConvertToNinjaPath(objectDir.c_str()).c_str(),
cmLocalGenerator::SHELL);
- const char* srcpool = source->GetProperty("COMPILE_POOL");
- if (srcpool) {
- vars["pool"] = srcpool;
- } else {
- const char* targetpool = this->GetTarget()->GetProperty("COMPILE_POOL");
- if (targetpool) {
- vars["pool"] = targetpool;
- }
- }
-
-
this->SetMsvcTargetPdbVariable(vars);
if(this->Makefile->IsOn("CMAKE_EXPORT_COMPILE_COMMANDS"))
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index a8603e6..5f7a26f 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -308,7 +308,7 @@ void cmQtAutoGenerators::SetupAutoGenerateTarget(cmTarget* target)
std::vector<std::string> no_output;
cmCustomCommand cc(makefile, no_output, depends,
commandLines, autogenComment.c_str(),
- workingDirectory.c_str(), 0);
+ workingDirectory.c_str());
cc.SetEscapeOldStyle(false);
cc.SetEscapeAllowMakeVars(true);
target->GetPreBuildCommands().push_back(cc);
-----------------------------------------------------------------------
Summary of changes:
Help/manual/cmake-properties.7.rst | 3 ---
Help/prop_gbl/POOLS.rst | 9 ---------
Help/prop_tgt/COMPILE_POOL.rst | 7 -------
Help/prop_tgt/LINK_POOL.rst | 7 -------
Source/cmAddCustomCommandCommand.cxx | 12 +-----------
Source/cmAddCustomCommandCommand.h | 1 -
Source/cmCustomCommand.cxx | 11 +----------
Source/cmCustomCommand.h | 7 +------
Source/cmGlobalGenerator.cxx | 2 +-
Source/cmGlobalNinjaGenerator.cxx | 5 +----
Source/cmGlobalNinjaGenerator.h | 4 +---
Source/cmGlobalXCodeGenerator.cxx | 2 +-
Source/cmLocalNinjaGenerator.cxx | 30 +-----------------------------
Source/cmLocalNinjaGenerator.h | 1 -
Source/cmLocalVisualStudio6Generator.cxx | 2 +-
Source/cmLocalVisualStudioGenerator.cxx | 2 +-
Source/cmMakefile.cxx | 12 +++++-------
Source/cmMakefile.h | 12 ++++--------
Source/cmNinjaNormalTargetGenerator.cxx | 9 ++-------
Source/cmNinjaTargetGenerator.cxx | 12 ------------
Source/cmQtAutoGenerators.cxx | 2 +-
21 files changed, 22 insertions(+), 130 deletions(-)
delete mode 100644 Help/prop_gbl/POOLS.rst
delete mode 100644 Help/prop_tgt/COMPILE_POOL.rst
delete mode 100644 Help/prop_tgt/LINK_POOL.rst
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list