diff options
| author | Alex Neundorf <neundorf@kde.org> | 2012-09-30 16:34:57 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2012-11-06 16:54:58 (GMT) |
| commit | 05f162ce9571d1ec7dee6f4c4b76126526247b14 (patch) | |
| tree | 79071ee674bf7d74475c68a2ee946a8083ffc454 /Source | |
| parent | c66f03adf93fc402141ed5dc17d39bae1af3bbfd (diff) | |
| download | CMake-05f162ce9571d1ec7dee6f4c4b76126526247b14.zip CMake-05f162ce9571d1ec7dee6f4c4b76126526247b14.tar.gz CMake-05f162ce9571d1ec7dee6f4c4b76126526247b14.tar.bz2 | |
AddCustomCommand: Handle multiple IMPLICIT_DEPENDS files (#10048)
The code handling IMPLICIT_DEPENDS was only able to track a single file,
the latest file replaced earlier files in the list.
The documentation now mentions that the language has to be prefixed to
every file and the test now uses two implicit dependencies, where only
the second is modified to trigger re-running of the custom command.
Alex
Inspired-by: Michael Wild <themiwi@users.sourceforge.net>
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmAddCustomCommandCommand.h | 5 | ||||
| -rw-r--r-- | Source/cmLocalUnixMakefileGenerator3.cxx | 10 | ||||
| -rw-r--r-- | Source/cmLocalUnixMakefileGenerator3.h | 3 |
3 files changed, 13 insertions, 5 deletions
diff --git a/Source/cmAddCustomCommandCommand.h b/Source/cmAddCustomCommandCommand.h index c5252b7..1cc1e3a 100644 --- a/Source/cmAddCustomCommandCommand.h +++ b/Source/cmAddCustomCommandCommand.h @@ -68,7 +68,8 @@ public: " [COMMAND command2 [ARGS] [args2...] ...]\n" " [MAIN_DEPENDENCY depend]\n" " [DEPENDS [depends...]]\n" - " [IMPLICIT_DEPENDS <lang1> depend1 ...]\n" + " [IMPLICIT_DEPENDS <lang1> depend1\n" + " [<lang2> depend2] ...]\n" " [WORKING_DIRECTORY dir]\n" " [COMMENT comment] [VERBATIM] [APPEND])\n" "This defines a command to generate specified OUTPUT file(s). " @@ -142,6 +143,8 @@ public: "dependencies of an input file. The language given specifies the " "programming language whose corresponding dependency scanner should " "be used. Currently only C and CXX language scanners are supported. " + "The language has to be specified for every file in the " + "IMPLICIT_DEPENDS list. " "Dependencies discovered from the scanning are added to those of " "the custom command at build time. Note that the IMPLICIT_DEPENDS " "option is currently supported only for Makefile generators and " diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx index db93529..820d25a 100644 --- a/Source/cmLocalUnixMakefileGenerator3.cxx +++ b/Source/cmLocalUnixMakefileGenerator3.cxx @@ -1939,8 +1939,12 @@ void cmLocalUnixMakefileGenerator3 for(ImplicitDependFileMap::const_iterator pi = implicitPairs.begin(); pi != implicitPairs.end(); ++pi) { - cmakefileStream << " \"" << pi->second << "\" "; - cmakefileStream << "\"" << pi->first << "\"\n"; + for(cmDepends::DependencyVector::const_iterator di = pi->second.begin(); + di != pi->second.end(); ++ di) + { + cmakefileStream << " \"" << *di << "\" "; + cmakefileStream << "\"" << pi->first << "\"\n"; + } } cmakefileStream << " )\n"; @@ -2204,7 +2208,7 @@ cmLocalUnixMakefileGenerator3::AddImplicitDepends(cmTarget const& tgt, const char* obj, const char* src) { - this->ImplicitDepends[tgt.GetName()][lang][obj] = src; + this->ImplicitDepends[tgt.GetName()][lang][obj].push_back(src); } //---------------------------------------------------------------------------- diff --git a/Source/cmLocalUnixMakefileGenerator3.h b/Source/cmLocalUnixMakefileGenerator3.h index e374959..703369e 100644 --- a/Source/cmLocalUnixMakefileGenerator3.h +++ b/Source/cmLocalUnixMakefileGenerator3.h @@ -209,7 +209,8 @@ public: // File pairs for implicit dependency scanning. The key of the map // is the depender and the value is the explicit dependee. - struct ImplicitDependFileMap: public std::map<cmStdString, cmStdString> {}; + struct ImplicitDependFileMap: + public std::map<cmStdString, cmDepends::DependencyVector> {}; struct ImplicitDependLanguageMap: public std::map<cmStdString, ImplicitDependFileMap> {}; struct ImplicitDependTargetMap: |