diff options
| -rw-r--r-- | .gitlab/rules.yml | 3 | ||||
| -rw-r--r-- | Source/cmQtAutoMocUic.cxx | 11 |
2 files changed, 8 insertions, 6 deletions
diff --git a/.gitlab/rules.yml b/.gitlab/rules.yml index b3e5342..256f567 100644 --- a/.gitlab/rules.yml +++ b/.gitlab/rules.yml @@ -31,7 +31,8 @@ - if: '$CI_MERGE_REQUEST_ID' when: on_success - if: '$CI_PROJECT_PATH == "cmake/cmake"' - when: on_success + when: delayed + start_in: 5 minutes - when: never .run_dependent: diff --git a/Source/cmQtAutoMocUic.cxx b/Source/cmQtAutoMocUic.cxx index 535f786..f583162 100644 --- a/Source/cmQtAutoMocUic.cxx +++ b/Source/cmQtAutoMocUic.cxx @@ -564,8 +564,7 @@ private: // -- Generation bool CreateDirectories(); // -- Support for depfiles - static std::vector<std::string> dependenciesFromDepFile( - const char* filePath); + std::vector<std::string> dependenciesFromDepFile(const char* filePath); // -- Settings BaseSettingsT BaseConst_; @@ -2066,7 +2065,8 @@ void cmQtAutoMocUicT::JobCompileMocT::Process() " does not exist."); return; } - this->CacheEntry->Moc.Depends = dependenciesFromDepFile(depfile.c_str()); + this->CacheEntry->Moc.Depends = + this->Gen()->dependenciesFromDepFile(depfile.c_str()); } } @@ -2223,12 +2223,12 @@ void cmQtAutoMocUicT::JobDepFilesMergeT::Process() this->MessagePath(this->BaseConst().DepFile.c_str()))); } auto processDepFile = - [](const std::string& mocOutputFile) -> std::vector<std::string> { + [this](const std::string& mocOutputFile) -> std::vector<std::string> { std::string f = mocOutputFile + ".d"; if (!cmSystemTools::FileExists(f)) { return {}; } - return dependenciesFromDepFile(f.c_str()); + return this->Gen()->dependenciesFromDepFile(f.c_str()); }; std::vector<std::string> dependencies = this->initialDependencies(); @@ -2961,6 +2961,7 @@ bool cmQtAutoMocUicT::CreateDirectories() std::vector<std::string> cmQtAutoMocUicT::dependenciesFromDepFile( const char* filePath) { + std::lock_guard<std::mutex> guard(this->CMakeLibMutex_); auto const content = cmReadGccDepfile(filePath); if (!content || content->empty()) { return {}; |