[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5779-gc46956e
Peter Kuemmel
syntheticpp at gmx.net
Mon Nov 25 14:16:15 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 c46956e596f36dc61e266a785e8b1aaed684c16a (commit)
via c447ad8f98b17e56411a3682138e1eb984d00b67 (commit)
from 901b076a16d6008643149e550f2ba3b65c80d34f (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=c46956e596f36dc61e266a785e8b1aaed684c16a
commit c46956e596f36dc61e266a785e8b1aaed684c16a
Merge: 901b076 c447ad8
Author: Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Mon Nov 25 14:16:11 2013 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Nov 25 14:16:11 2013 -0500
Merge topic 'ninja-compile-link-pool' into next
c447ad8 Revert "Ninja: job pool support for compiling and linking"
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c447ad8f98b17e56411a3682138e1eb984d00b67
commit c447ad8f98b17e56411a3682138e1eb984d00b67
Author: Peter Kümmel <syntheticpp at gmx.net>
AuthorDate: Mon Nov 25 20:15:00 2013 +0100
Commit: Peter Kümmel <syntheticpp at gmx.net>
CommitDate: Mon Nov 25 20:15:00 2013 +0100
Revert "Ninja: job pool support for compiling and linking"
This reverts commit 5561d55355ecb5d62335a632561aeecd7d38b587.
diff --git a/Help/manual/cmake-properties.7.rst b/Help/manual/cmake-properties.7.rst
index c70c08b..abc6fde 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/JOB_POOLS
/prop_gbl/PREDEFINED_TARGETS_FOLDER
/prop_gbl/ECLIPSE_EXTRA_NATURES
/prop_gbl/REPORT_UNDEFINED_PROPERTIES
@@ -148,8 +147,6 @@ Properties on Targets
/prop_tgt/INTERFACE_SYSTEM_INCLUDE_DIRECTORIES
/prop_tgt/INTERPROCEDURAL_OPTIMIZATION_CONFIG
/prop_tgt/INTERPROCEDURAL_OPTIMIZATION
- /prop_tgt/JOB_POOL_COMPILE
- /prop_tgt/JOB_POOL_LINK
/prop_tgt/LABELS
/prop_tgt/LANG_VISIBILITY_PRESET
/prop_tgt/LIBRARY_OUTPUT_DIRECTORY_CONFIG
diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst
index 4e24823..a46539f 100644
--- a/Help/manual/cmake-variables.7.rst
+++ b/Help/manual/cmake-variables.7.rst
@@ -41,8 +41,6 @@ Variables that Provide Information
/variable/CMAKE_HOME_DIRECTORY
/variable/CMAKE_IMPORT_LIBRARY_PREFIX
/variable/CMAKE_IMPORT_LIBRARY_SUFFIX
- /variable/CMAKE_JOB_POOL_COMPILE
- /variable/CMAKE_JOB_POOL_LINK
/variable/CMAKE_LINK_LIBRARY_SUFFIX
/variable/CMAKE_MAJOR_VERSION
/variable/CMAKE_MAKE_PROGRAM
diff --git a/Help/prop_gbl/JOB_POOLS.rst b/Help/prop_gbl/JOB_POOLS.rst
deleted file mode 100644
index 875bdde..0000000
--- a/Help/prop_gbl/JOB_POOLS.rst
+++ /dev/null
@@ -1,14 +0,0 @@
-JOB_POOLS
----------
-
-Ninja only: List of available pools.
-
-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 JOB_POOLS property is a semicolon-separated list of pairs using
-the syntax NAME=integer.
-
-For instance set_property(GLOBAL PROPERTY POOLS "two_jobs=2;ten_jobs=10").
-
-Defined pools could be used globally by setting CMAKE_JOB_POOL_COMPILE/LINK
-or per target by setting the target property JOB_POOL_COMPILE/LINK.
diff --git a/Help/prop_tgt/JOB_POOL_COMPILE.rst b/Help/prop_tgt/JOB_POOL_COMPILE.rst
deleted file mode 100644
index 842db58..0000000
--- a/Help/prop_tgt/JOB_POOL_COMPILE.rst
+++ /dev/null
@@ -1,11 +0,0 @@
-JOB_POOL_COMPILE
-----------------
-
-Ninja only: Pool used for compiling.
-
-The number of parallel compile processes could be limited by defining
-pools with the global JOB_POOLS property and then specifing here the pool name.
-
-For instance set_target_properties(target PROPERTIES JOB_POOL_COMPILE ten_jobs)
-
-This property overwrites the variable CMAKE_JOB_POOL_COMPILE.
diff --git a/Help/prop_tgt/JOB_POOL_LINK.rst b/Help/prop_tgt/JOB_POOL_LINK.rst
deleted file mode 100644
index c8a94ba..0000000
--- a/Help/prop_tgt/JOB_POOL_LINK.rst
+++ /dev/null
@@ -1,11 +0,0 @@
-JOB_POOL_LINK
--------------
-
-Ninja only: Pool used for linking.
-
-The number of parallel link processes could be limited by defining
-pools with the global JOB_POOLS property and then specifing here the pool name.
-
-For instance set_target_properties(target PROPERTIES JOB_POOL_LINK two_jobs)
-
-This property overwrites the variable CMAKE_JOB_POOL_LINK.
diff --git a/Help/variable/CMAKE_JOB_POOL_COMPILE.rst b/Help/variable/CMAKE_JOB_POOL_COMPILE.rst
deleted file mode 100644
index 373f831..0000000
--- a/Help/variable/CMAKE_JOB_POOL_COMPILE.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-CMAKE_JOB_POOL_LINK
--------------------
-
-Job pool used for linking.
-
-If this variable is set to a pool name defined in JOB_POOLS,
-this pool is used for linking without explicitely setting
-the the target property JOB_POOL_LINK.
-
-Setting JOB_POOL_LINK on a target overwrites CMAKE_JOB_POOL_LINK.
diff --git a/Help/variable/CMAKE_JOB_POOL_LINK.rst b/Help/variable/CMAKE_JOB_POOL_LINK.rst
deleted file mode 100644
index 8358f6a..0000000
--- a/Help/variable/CMAKE_JOB_POOL_LINK.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-CMAKE_JOB_POOL_COMPILE
-----------------------
-
-Job pool used for compiling.
-
-If this variable is set to a pool name defined in JOB_POOLS,
-this pool is used for compling without explicitely setting
-the the target property JOB_POOL_COMPILING.
-
-Setting JOB_POOL_COMPILING on a target overwrites CMAKE_JOB_POOL_COMPILE.
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx
index 1caf38b..f1d5e2c 100644
--- a/Source/cmLocalNinjaGenerator.cxx
+++ b/Source/cmLocalNinjaGenerator.cxx
@@ -53,8 +53,6 @@ void cmLocalNinjaGenerator::Generate()
{
this->WriteBuildFileTop();
- this->WritePools(this->GetRulesFileStream());
-
const std::string showIncludesPrefix = this->GetMakefile()
->GetSafeDefinition("CMAKE_CL_SHOWINCLUDES_PREFIX");
if (!showIncludesPrefix.empty())
@@ -197,32 +195,6 @@ void cmLocalNinjaGenerator::WriteProjectHeader(std::ostream& os)
cmGlobalNinjaGenerator::WriteDivider(os);
}
-void cmLocalNinjaGenerator::WritePools(std::ostream& os)
-{
- cmGlobalNinjaGenerator::WriteDivider(os);
-
- const char* jobpools = this->GetCMakeInstance()
- ->GetProperty("JOB_POOLS", cmProperty::GLOBAL);
- if (jobpools)
- {
- cmGlobalNinjaGenerator::WriteComment(os,
- "Pools defined by global property JOB_POOLS");
- std::vector<std::string> pools;
- cmSystemTools::ExpandListArgument(jobpools, 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;
- }
- }
- }
-}
-
void cmLocalNinjaGenerator::WriteNinjaFilesInclusion(std::ostream& os)
{
cmGlobalNinjaGenerator::WriteDivider(os);
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/cmMakefile.h b/Source/cmMakefile.h
index 287ecaf..44aaa66 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -190,7 +190,6 @@ public:
const char* comment, const char* workingDir,
bool replace = false,
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 e65c4b5..d8e9b34 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -462,8 +462,6 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
linkPath,
this->GetGeneratorTarget());
- this->addPoolNinjaVariable("JOB_POOL_LINK", this->GetTarget(), vars);
-
this->AddModuleDefinitionFlag(vars["LINK_FLAGS"]);
vars["LINK_FLAGS"] = cmGlobalNinjaGenerator
::EncodeLiteral(vars["LINK_FLAGS"]);
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index e9cdf93..26eadbe 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -572,8 +572,6 @@ cmNinjaTargetGenerator
ConvertToNinjaPath(objectDir.c_str()).c_str(),
cmLocalGenerator::SHELL);
- this->addPoolNinjaVariable("JOB_POOL_COMPILE", this->GetTarget(), vars);
-
this->SetMsvcTargetPdbVariable(vars);
if(this->Makefile->IsOn("CMAKE_EXPORT_COMPILE_COMMANDS"))
@@ -727,19 +725,3 @@ cmNinjaTargetGenerator::MacOSXContentGeneratorType::operator()(
// Add as a dependency of all target so that it gets called.
this->Generator->GetGlobalGenerator()->AddDependencyToAll(output);
}
-
-void cmNinjaTargetGenerator::addPoolNinjaVariable(const char* pool_property,
- cmTarget* target,
- cmNinjaVars& vars)
-{
- const char* pool = target->GetProperty(pool_property);
- if (!pool)
- {
- const std::string var = std::string("CMAKE_") + pool_property;
- pool = this->GetMakefile()->GetDefinition(var.c_str());
- }
- if (pool)
- {
- vars["pool"] = pool;
- }
-}
diff --git a/Source/cmNinjaTargetGenerator.h b/Source/cmNinjaTargetGenerator.h
index cfc95f5..1cf811a 100644
--- a/Source/cmNinjaTargetGenerator.h
+++ b/Source/cmNinjaTargetGenerator.h
@@ -136,15 +136,12 @@ protected:
};
friend struct MacOSXContentGeneratorType;
-
+protected:
MacOSXContentGeneratorType* MacOSXContentGenerator;
// Properly initialized by sub-classes.
cmOSXBundleGenerator* OSXBundleGenerator;
std::set<cmStdString> MacContentFolders;
- void addPoolNinjaVariable(const char* pool_property,
- cmTarget* target,
- cmNinjaVars& vars);
private:
cmTarget* Target;
-----------------------------------------------------------------------
Summary of changes:
Help/manual/cmake-properties.7.rst | 3 ---
Help/manual/cmake-variables.7.rst | 2 --
Help/prop_gbl/JOB_POOLS.rst | 14 --------------
Help/prop_tgt/JOB_POOL_COMPILE.rst | 11 -----------
Help/prop_tgt/JOB_POOL_LINK.rst | 11 -----------
Help/variable/CMAKE_JOB_POOL_COMPILE.rst | 10 ----------
Help/variable/CMAKE_JOB_POOL_LINK.rst | 10 ----------
Source/cmLocalNinjaGenerator.cxx | 28 ----------------------------
Source/cmLocalNinjaGenerator.h | 1 -
Source/cmMakefile.h | 1 -
Source/cmNinjaNormalTargetGenerator.cxx | 2 --
Source/cmNinjaTargetGenerator.cxx | 18 ------------------
Source/cmNinjaTargetGenerator.h | 5 +----
13 files changed, 1 insertions(+), 115 deletions(-)
delete mode 100644 Help/prop_gbl/JOB_POOLS.rst
delete mode 100644 Help/prop_tgt/JOB_POOL_COMPILE.rst
delete mode 100644 Help/prop_tgt/JOB_POOL_LINK.rst
delete mode 100644 Help/variable/CMAKE_JOB_POOL_COMPILE.rst
delete mode 100644 Help/variable/CMAKE_JOB_POOL_LINK.rst
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list