diff options
author | Daniel Pfeifer <daniel@pfeifer-mail.de> | 2016-05-19 21:11:40 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2016-05-25 13:20:09 (GMT) |
commit | 25d1ef6424e0b06687739c91a646633ab9aaf861 (patch) | |
tree | 9e2f9815008c77ec866f88904d2e7c1b8339004e /Source/cmDependsC.cxx | |
parent | c75d91a05c9f442582726e3e80fec41d016da76f (diff) | |
download | CMake-25d1ef6424e0b06687739c91a646633ab9aaf861.zip CMake-25d1ef6424e0b06687739c91a646633ab9aaf861.tar.gz CMake-25d1ef6424e0b06687739c91a646633ab9aaf861.tar.bz2 |
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/cmDependsC.cxx')
-rw-r--r-- | Source/cmDependsC.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/cmDependsC.cxx b/Source/cmDependsC.cxx index 0a5c7fa..78bb1b2 100644 --- a/Source/cmDependsC.cxx +++ b/Source/cmDependsC.cxx @@ -238,17 +238,17 @@ bool cmDependsC::WriteDependencies(const std::set<std::string>& sources, // convert the dependencies to paths relative to the home output // directory. We must do the same here. std::string obj_i = - this->LocalGenerator->Convert(obj, cmLocalGenerator::HOME_OUTPUT); + this->LocalGenerator->Convert(obj, cmOutputConverter::HOME_OUTPUT); std::string obj_m = this->LocalGenerator->ConvertToOutputFormat( - obj_i, cmLocalGenerator::MAKERULE); + obj_i, cmOutputConverter::MAKERULE); internalDepends << obj_i << std::endl; for (std::set<std::string>::const_iterator i = dependencies.begin(); i != dependencies.end(); ++i) { makeDepends << obj_m << ": " - << this->LocalGenerator->Convert(*i, - cmLocalGenerator::HOME_OUTPUT, - cmLocalGenerator::MAKERULE) + << this->LocalGenerator->Convert( + *i, cmOutputConverter::HOME_OUTPUT, + cmOutputConverter::MAKERULE) << std::endl; internalDepends << " " << *i << std::endl; } |