diff options
| author | Daniel Pfeifer <daniel@pfeifer-mail.de> | 2016-05-19 23:11:40 +0200 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-05-25 09:20:09 -0400 |
| commit | 25d1ef6424e0b06687739c91a646633ab9aaf861 (patch) | |
| tree | 9e2f9815008c77ec866f88904d2e7c1b8339004e /Source/cmLocalUnixMakefileGenerator3.h | |
| parent | c75d91a05c9f442582726e3e80fec41d016da76f (diff) | |
| download | cmake-25d1ef6424e0b06687739c91a646633ab9aaf861.tar.gz | |
Use enums defined in cmOutputConverter using their fully qualified name.
Mostly automated:
values=("RelativeRoot" "NONE" "FULL" "HOME" "START" "HOME_OUTPUT" "START_OUTPUT"
"OutputFormat" "UNCHANGED" "MAKERULE" "SHELL" "WATCOMQUOTE" "RESPONSE"
"FortranFormat" "FortranFormatNone" "FortranFormatFixed" "FortranFormatFree")
for i in "${values[@]}"; do git grep -l cmLocalGenerator::$i | xargs sed -i "s|cmLocalGenerator::$i|cmOutputConverter::$i|g"; done
Diffstat (limited to 'Source/cmLocalUnixMakefileGenerator3.h')
| -rw-r--r-- | Source/cmLocalUnixMakefileGenerator3.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator3.h b/Source/cmLocalUnixMakefileGenerator3.h index 321edcb641..a65a1a1cff 100644 --- a/Source/cmLocalUnixMakefileGenerator3.h +++ b/Source/cmLocalUnixMakefileGenerator3.h @@ -120,7 +120,7 @@ public: // create a command that cds to the start dir then runs the commands void CreateCDCommand(std::vector<std::string>& commands, const char* targetDir, - cmLocalGenerator::RelativeRoot returnDir); + cmOutputConverter::RelativeRoot returnDir); static std::string ConvertToQuotedOutputPath(const char* p, bool useWatcomQuote); @@ -230,11 +230,11 @@ protected: void AppendCustomCommands( std::vector<std::string>& commands, const std::vector<cmCustomCommand>& ccs, cmGeneratorTarget* target, - cmLocalGenerator::RelativeRoot relative = cmLocalGenerator::HOME_OUTPUT); + cmOutputConverter::RelativeRoot relative = cmOutputConverter::HOME_OUTPUT); void AppendCustomCommand( std::vector<std::string>& commands, cmCustomCommandGenerator const& ccg, cmGeneratorTarget* target, bool echo_comment = false, - cmLocalGenerator::RelativeRoot relative = cmLocalGenerator::HOME_OUTPUT, + cmOutputConverter::RelativeRoot relative = cmOutputConverter::HOME_OUTPUT, std::ostream* content = 0); void AppendCleanCommand(std::vector<std::string>& commands, const std::vector<std::string>& files, @@ -247,9 +247,11 @@ protected: void CheckMultipleOutputs(bool verbose); private: - std::string ConvertShellCommand(std::string const& cmd, RelativeRoot root); + std::string ConvertShellCommand(std::string const& cmd, + cmOutputConverter::RelativeRoot root); std::string MakeLauncher(cmCustomCommandGenerator const& ccg, - cmGeneratorTarget* target, RelativeRoot relative); + cmGeneratorTarget* target, + cmOutputConverter::RelativeRoot relative); virtual void ComputeObjectFilenames( std::map<cmSourceFile const*, std::string>& mapping, |