diff options
| author | Brad King <brad.king@kitware.com> | 2020-09-09 15:23:54 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-09-09 15:24:34 (GMT) |
| commit | 8de27c599f297654342920b0b8aec65c3245936f (patch) | |
| tree | b36d781b470b9213bfedc1e23cb854f08c1515d0 | |
| parent | 802584f0c26ffbf4b311c176d37a6e4fee70eb7c (diff) | |
| parent | ce7c100545c6618e4d4263a5b651163974112f94 (diff) | |
| download | CMake-8de27c599f297654342920b0b8aec65c3245936f.zip CMake-8de27c599f297654342920b0b8aec65c3245936f.tar.gz CMake-8de27c599f297654342920b0b8aec65c3245936f.tar.bz2 | |
Merge topic 'pch-tv90' into release-3.18
ce7c100545 PCH: Fix 30s wait for VS2008 when used via -Tv90
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5199
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 28 |
1 files changed, 20 insertions, 8 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index c15ca7c..d1ab62b 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -2682,17 +2682,29 @@ void cmLocalGenerator::AddPchDependencies(cmGeneratorTarget* target) this->Makefile->GetSafeDefinition( cmStrCat("CMAKE_", lang, "_FLAGS_", configUpper)); + bool editAndContinueDebugInfo = + langFlags.find("/ZI") != std::string::npos || + langFlags.find("-ZI") != std::string::npos; + + bool enableDebuggingInformation = + langFlags.find("/Zi") != std::string::npos || + langFlags.find("-Zi") != std::string::npos; + // MSVC 2008 is producing both .pdb and .idb files with /Zi. - if ((langFlags.find("/ZI") != std::string::npos || - langFlags.find("-ZI") != std::string::npos) || - (cmSystemTools::VersionCompare(cmSystemTools::OP_LESS, - compilerVersion.c_str(), - "16.0") && - compilerId == "MSVC")) { + bool msvc2008OrLess = + cmSystemTools::VersionCompare( + cmSystemTools::OP_LESS, compilerVersion.c_str(), "16.0") && + compilerId == "MSVC"; + // but not when used via toolset -Tv90 + if (this->Makefile->GetSafeDefinition( + "CMAKE_VS_PLATFORM_TOOLSET") == "v90") { + msvc2008OrLess = false; + } + + if (editAndContinueDebugInfo || msvc2008OrLess) { CopyPchCompilePdb(config, target, *ReuseFrom, reuseTarget, { ".pdb", ".idb" }); - } else if ((langFlags.find("/Zi") != std::string::npos || - langFlags.find("-Zi") != std::string::npos)) { + } else if (enableDebuggingInformation) { CopyPchCompilePdb(config, target, *ReuseFrom, reuseTarget, { ".pdb" }); } |