diff options
| author | Brad King <brad.king@kitware.com> | 2020-01-16 15:33:41 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-01-16 15:33:48 (GMT) |
| commit | 05738b5f21c95c83dbd25bfb4e8bfc1be5be713a (patch) | |
| tree | 49c619949293cd44d75883d196692dc6f820e3d1 /Source | |
| parent | c0ac53b90c170e781b085e219dae6cc03cccdfd3 (diff) | |
| parent | 97c124e30f530f64fafdc2b3a9decd1bf31bcf9c (diff) | |
| download | CMake-05738b5f21c95c83dbd25bfb4e8bfc1be5be713a.zip CMake-05738b5f21c95c83dbd25bfb4e8bfc1be5be713a.tar.gz CMake-05738b5f21c95c83dbd25bfb4e8bfc1be5be713a.tar.bz2 | |
Merge topic 'pch_job_pool'
97c124e30f Ninja: Add a separate job pool for PCH creation
ebd0b16ddb vim: Add target_precompile_headers command highlighting
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Cristian Adam <cristian.adam@gmail.com>
Merge-request: !4224
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmNinjaTargetGenerator.cxx | 7 | ||||
| -rw-r--r-- | Source/cmTarget.cxx | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx index bd19b28..5a8c144 100644 --- a/Source/cmNinjaTargetGenerator.cxx +++ b/Source/cmNinjaTargetGenerator.cxx @@ -1196,6 +1196,13 @@ void cmNinjaTargetGenerator::WriteObjectBuildStatement( this->addPoolNinjaVariable("JOB_POOL_COMPILE", this->GetGeneratorTarget(), vars); + if (!pchSource.empty() && !source->GetProperty("SKIP_PRECOMPILE_HEADERS")) { + if (source->GetFullPath() == pchSource) { + this->addPoolNinjaVariable("JOB_POOL_PRECOMPILE_HEADER", + this->GetGeneratorTarget(), vars); + } + } + this->SetMsvcTargetPdbVariable(vars, config); objBuild.RspFile = objectFileName + ".rsp"; diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index 6590629..ae1393f 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -513,6 +513,7 @@ cmTarget::cmTarget(std::string const& name, cmStateEnums::TargetType type, this->GetType() != cmStateEnums::UTILITY) { initProp("JOB_POOL_COMPILE"); initProp("JOB_POOL_LINK"); + initProp("JOB_POOL_PRECOMPILE_HEADER"); } if (impl->TargetType <= cmStateEnums::UTILITY) { |