summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2020-08-06 14:38:27 (GMT)
committerKitware Robot <kwrobot@kitware.com>2020-08-06 14:39:46 (GMT)
commit13e5df19fdeaf16ff51819caf322a426ecaf328c (patch)
tree079b626cf6677fbb71a5927ae0623d5ee4d4382f
parent9c4130ed604fd1fcb35f0ae37a94011a74c750d4 (diff)
parentef97fbe6c203e6504cae9282c3b826d9e4d84147 (diff)
downloadCMake-13e5df19fdeaf16ff51819caf322a426ecaf328c.zip
CMake-13e5df19fdeaf16ff51819caf322a426ecaf328c.tar.gz
CMake-13e5df19fdeaf16ff51819caf322a426ecaf328c.tar.bz2
Merge topic 'reuse_pch_no_delay' into release-3.18
ef97fbe6c2 PCH: Avoid unnecessary 30s delay on MSBuild Generator with REUSE_FROM Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5102
-rw-r--r--Source/cmLocalGenerator.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index e26dc94..c15ca7c 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -2789,7 +2789,7 @@ void cmLocalGenerator::CopyPchCompilePdb(
}
file << " break()\n"
<< " endif()\n";
- file << " else()\n"
+ file << " elseif(NOT EXISTS \"" << from_file << "\")\n"
<< " execute_process(COMMAND ${CMAKE_COMMAND}"
<< " -E sleep 1)\n"
<< " endif()\n";