[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5793-gfda1608
Peter Kuemmel
syntheticpp at gmx.net
Mon Nov 25 16:03:59 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 fda16083f3857273b4bebd7f5ac57b12e316390b (commit)
via e851195b3b203832d6199e43ea74737c6170b4d7 (commit)
from 49b658e58e76c7f6f414880b5a74ead67668a3a3 (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=fda16083f3857273b4bebd7f5ac57b12e316390b
commit fda16083f3857273b4bebd7f5ac57b12e316390b
Merge: 49b658e e851195
Author: Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Mon Nov 25 16:03:55 2013 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Nov 25 16:03:55 2013 -0500
Merge topic 'ninja-compile-link-pool' into next
e851195 Revert "Ninja: job pool support for compiling and linking"
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e851195b3b203832d6199e43ea74737c6170b4d7
commit e851195b3b203832d6199e43ea74737c6170b4d7
Author: Peter Kümmel <syntheticpp at gmx.net>
AuthorDate: Mon Nov 25 22:03:25 2013 +0100
Commit: Peter Kümmel <syntheticpp at gmx.net>
CommitDate: Mon Nov 25 22:03:25 2013 +0100
Revert "Ninja: job pool support for compiling and linking"
This reverts commit 8e393fb16ff696529af5d9e41fbcfc35df6ef54c.
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 27975da..0000000
--- a/Help/prop_gbl/JOB_POOLS.rst
+++ /dev/null
@@ -1,20 +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 :prop_gbl:`JOB_POOLS` property is a semicolon-separated list of
-pairs using the syntax NAME=integer (without a space after the equality sign).
-
-For instance:
-
-.. code-block:: cmake
-
- set_property(GLOBAL PROPERTY JOB_POOLS two_jobs=2 ten_jobs=10).
-
-Defined pools could be used globally by setting
-:variable:`CMAKE_JOB_POOL_COMPILE` and :variable:`CMAKE_JOB_POOL_LINK`
-or per target by setting the target properties
-:prop_tgt:`JOB_POOL_COMPILE` and :prop_tgt:`JOB_POOL_LINK`
diff --git a/Help/prop_tgt/JOB_POOL_COMPILE.rst b/Help/prop_tgt/JOB_POOL_COMPILE.rst
deleted file mode 100644
index db78e46..0000000
--- a/Help/prop_tgt/JOB_POOL_COMPILE.rst
+++ /dev/null
@@ -1,16 +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 :prop_gbl:`JOB_POOLS`
-property and then specifinghere the pool name.
-
-For instance:
-
-.. code-block:: cmake
-
- set_target_properties(target PROPERTIES JOB_POOL_COMPILE ten_jobs)
-
-This property overwrites the variable :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 ff2541c..0000000
--- a/Help/prop_tgt/JOB_POOL_LINK.rst
+++ /dev/null
@@ -1,16 +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 :prop_gbl:`JOB_POOLS`
-property and then specifing here the pool name.
-
-For instance:
-
-.. code-block:: cmake
-
- set_target_properties(target PROPERTIES JOB_POOL_LINK two_jobs)
-
-This property overwrites the variable :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 9e41dc8..0000000
--- a/Help/variable/CMAKE_JOB_POOL_COMPILE.rst
+++ /dev/null
@@ -1,12 +0,0 @@
-CMAKE_JOB_POOL_COMPILE
-----------------------
-
-Job pool used for compiling.
-
-If this variable is set to a pool name defined by the global
-:prop_gbl:`JOB_POOLS` property,
-this pool is used for compling without explicitely setting
-the the target property :prop_tgt:`JOB_POOL_COMPILE`.
-
-Setting :prop_tgt:`JOB_POOL_COMPILE` on a target overwrites
-:variable:`CMAKE_JOB_POOL_COMPILE`.
diff --git a/Help/variable/CMAKE_JOB_POOL_LINK.rst b/Help/variable/CMAKE_JOB_POOL_LINK.rst
deleted file mode 100644
index 87768ed..0000000
--- a/Help/variable/CMAKE_JOB_POOL_LINK.rst
+++ /dev/null
@@ -1,12 +0,0 @@
-CMAKE_JOB_POOL_LINK
-----------------------
-
-Job pool used for linking.
-
-If this variable is set to a pool name defined by the global
-:prop_gbl:`JOB_POOLS` property
-this pool is used for linking without explicitely setting
-the the target property :prop_tgt:`JOB_POOL_LINK`.
-
-Setting :prop_tgt:`JOB_POOL_LINK` on a target overwrites
-:variable:`CMAKE_JOB_POOL_LINK`.
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx
index 5d2fb50..158d714 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())
@@ -202,39 +200,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];
- const std::string::size_type eq = pool.find("=");
- unsigned int jobs;
- if (eq != std::string::npos &&
- sscanf(pool.c_str() + eq, "=%u", &jobs) == 1)
- {
- os << "pool " << pool.substr(0, eq) << std::endl;
- os << " depth = " << jobs << std::endl;
- os << std::endl;
- }
- else
- {
- cmSystemTools::Error("Invalid pool defined by property 'JOB_POOLS': ",
- pool.c_str());
- }
- }
- }
-}
-
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 73ba815..2c96ede 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -464,8 +464,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 f40532c..b132db6 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,14 +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)
- {
- vars["pool"] = pool;
- }
-}
diff --git a/Source/cmNinjaTargetGenerator.h b/Source/cmNinjaTargetGenerator.h
index 2ce1ed7..e377a78 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;
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index b99448d..120a666 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -379,12 +379,6 @@ void cmTarget::SetMakefile(cmMakefile* mf)
// so ensure that the conditions don't lead to nonsense.
this->PolicyStatusCMP0022 = cmPolicies::NEW;
}
-
- this->SetPropertyDefault("JOB_POOL_COMPILE",
- this->Makefile->GetDefinition("CMAKE_JOB_POOL_COMPILE"));
-
- this->SetPropertyDefault("JOB_POOL_LINK",
- this->Makefile->GetDefinition("CMAKE_JOB_POOL_LINK"));
}
//----------------------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
Help/manual/cmake-properties.7.rst | 3 --
Help/manual/cmake-variables.7.rst | 2 -
Help/prop_gbl/JOB_POOLS.rst | 20 -----------------
Help/prop_tgt/JOB_POOL_COMPILE.rst | 16 -------------
Help/prop_tgt/JOB_POOL_LINK.rst | 16 -------------
Help/variable/CMAKE_JOB_POOL_COMPILE.rst | 12 ----------
Help/variable/CMAKE_JOB_POOL_LINK.rst | 12 ----------
Source/cmLocalNinjaGenerator.cxx | 35 ------------------------------
Source/cmLocalNinjaGenerator.h | 1 -
Source/cmMakefile.h | 1 -
Source/cmNinjaNormalTargetGenerator.cxx | 2 -
Source/cmNinjaTargetGenerator.cxx | 13 -----------
Source/cmNinjaTargetGenerator.h | 5 +---
Source/cmTarget.cxx | 6 -----
14 files changed, 1 insertions(+), 143 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