diff options
| author | Brad King <brad.king@kitware.com> | 2019-04-01 14:42:49 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-04-01 14:42:58 (GMT) |
| commit | 249fb7f71d6ed5feaae0dfbfa48f9bf665b1f551 (patch) | |
| tree | 692b53cca9a81823320ed5920eea5a4779667899 /Source/cmLocalUnixMakefileGenerator3.cxx | |
| parent | afa2614eea6571c36be130805ff876d25f3edae5 (diff) | |
| parent | 87341d8328c7b3a1d50cfd534ff4cb44334a2561 (diff) | |
| download | CMake-249fb7f71d6ed5feaae0dfbfa48f9bf665b1f551.zip CMake-249fb7f71d6ed5feaae0dfbfa48f9bf665b1f551.tar.gz CMake-249fb7f71d6ed5feaae0dfbfa48f9bf665b1f551.tar.bz2 | |
Merge topic 'cmDepends_tweaks'
87341d8328 cmDepends: Define DependencyMap instead of DependencyVector
5a15c9e7cb cmDepends: Refactor cmDepends::CheckDependencies method
5f6c236481 cmFiletimeCache: Add cmFiletimeCache::Remove method
18c30786a9 cmFileTime: Make cmFileTime::Compare method const
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3156
Diffstat (limited to 'Source/cmLocalUnixMakefileGenerator3.cxx')
| -rw-r--r-- | Source/cmLocalUnixMakefileGenerator3.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx index f6ee9fc..bece12e 100644 --- a/Source/cmLocalUnixMakefileGenerator3.cxx +++ b/Source/cmLocalUnixMakefileGenerator3.cxx @@ -1313,7 +1313,7 @@ bool cmLocalUnixMakefileGenerator3::UpdateDependencies( // The build.make file may have explicit dependencies for the object // files but these will not affect the scanning process so they need // not be considered. - std::map<std::string, cmDepends::DependencyVector> validDependencies; + cmDepends::DependencyMap validDependencies; bool needRescanDependencies = false; if (!needRescanDirInfo) { cmDependsC checker; @@ -1353,8 +1353,7 @@ bool cmLocalUnixMakefileGenerator3::UpdateDependencies( bool cmLocalUnixMakefileGenerator3::ScanDependencies( std::string const& targetDir, std::string const& dependFile, - std::string const& internalDependFile, - std::map<std::string, cmDepends::DependencyVector>& validDeps) + std::string const& internalDependFile, cmDepends::DependencyMap& validDeps) { // Read the directory information file. cmMakefile* mf = this->Makefile; |