diff options
| author | Brad King <brad.king@kitware.com> | 2020-03-30 15:49:13 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2020-03-30 15:49:13 (GMT) |
| commit | 9fce97939cfdc267bf2bffcbe1e874be7677356a (patch) | |
| tree | dff23bf1cc769671adfdd9948c579f0d7fcde2b0 /Source | |
| parent | 933d0691b2da3f9316f690b1d80efb085dfc1838 (diff) | |
| parent | 5a95b5e091fa2a2d0ad869a80c37eaa980917853 (diff) | |
| download | CMake-9fce97939cfdc267bf2bffcbe1e874be7677356a.zip CMake-9fce97939cfdc267bf2bffcbe1e874be7677356a.tar.gz CMake-9fce97939cfdc267bf2bffcbe1e874be7677356a.tar.bz2 | |
Merge branch 'backport-3.16-link-libs-config-case' into release-3.16
Merge-request: !4544
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index ffd46d4..af92e1b 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -2306,11 +2306,10 @@ void cmLocalGenerator::AddPchDependencies(cmGeneratorTarget* target) if (!this->GetGlobalGenerator()->IsMultiConfig()) { config = this->Makefile->GetSafeDefinition("CMAKE_BUILD_TYPE"); } - const std::string buildType = cmSystemTools::UpperCase(config); // FIXME: Refactor collection of sources to not evaluate object libraries. std::vector<cmSourceFile*> sources; - target->GetSourceFiles(sources, buildType); + target->GetSourceFiles(sources, config); for (const std::string& lang : { "C", "CXX", "OBJC", "OBJCXX" }) { auto langSources = @@ -2481,15 +2480,13 @@ void cmLocalGenerator::AddUnityBuild(cmGeneratorTarget* target) config = this->Makefile->GetSafeDefinition("CMAKE_BUILD_TYPE"); } - const std::string buildType = cmSystemTools::UpperCase(config); - std::string filename_base = cmStrCat(this->GetCurrentBinaryDirectory(), "/CMakeFiles/", target->GetName(), ".dir/Unity/"); // FIXME: Refactor collection of sources to not evaluate object libraries. std::vector<cmSourceFile*> sources; - target->GetSourceFiles(sources, buildType); + target->GetSourceFiles(sources, config); auto batchSizeString = target->GetProperty("UNITY_BUILD_BATCH_SIZE"); const size_t unityBatchSize = |