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/cmLocalGenerator.h | |
| 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/cmLocalGenerator.h')
| -rw-r--r-- | Source/cmLocalGenerator.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h index 892ad4f..5c603a6 100644 --- a/Source/cmLocalGenerator.h +++ b/Source/cmLocalGenerator.h @@ -174,9 +174,10 @@ public: bool GetRealDependency(const std::string& name, const std::string& config, std::string& dep); - virtual std::string ConvertToIncludeReference(std::string const& path, - OutputFormat format = SHELL, - bool forceFullPaths = false); + virtual std::string ConvertToIncludeReference( + std::string const& path, + cmOutputConverter::OutputFormat format = cmOutputConverter::SHELL, + bool forceFullPaths = false); /** Called from command-line hook to clear dependencies. */ virtual void ClearDependencies(cmMakefile* /* mf */, bool /* verbose */) {} @@ -353,8 +354,9 @@ protected: std::string& CreateSafeUniqueObjectFileName(const std::string& sin, std::string const& dir_max); - virtual std::string ConvertToLinkReference(std::string const& lib, - OutputFormat format = SHELL); + virtual std::string ConvertToLinkReference( + std::string const& lib, + cmOutputConverter::OutputFormat format = cmOutputConverter::SHELL); /** Check whether the native build system supports the given definition. Issues a warning. */ |