diff options
author | Brad King <brad.king@kitware.com> | 2014-03-04 17:57:44 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2014-03-04 17:58:57 (GMT) |
commit | 02bebd60e9255b6e3eb4bbd6208b4c5cd8f5da40 (patch) | |
tree | 67f0e338a4424508826fc61e7e947c35df7eab6d /Source/cmLocalGenerator.h | |
parent | c87517099abbef70b9718a3920954e9097f36bbe (diff) | |
download | CMake-02bebd60e9255b6e3eb4bbd6208b4c5cd8f5da40.zip CMake-02bebd60e9255b6e3eb4bbd6208b4c5cd8f5da40.tar.gz CMake-02bebd60e9255b6e3eb4bbd6208b4c5cd8f5da40.tar.bz2 |
cmLocalGenerator: Add format option to ConvertToOutputForExisting
Replace the hard-coded SHELL output format with an optional argument.
Diffstat (limited to 'Source/cmLocalGenerator.h')
-rw-r--r-- | Source/cmLocalGenerator.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h index 0f7fd25..9e47120 100644 --- a/Source/cmLocalGenerator.h +++ b/Source/cmLocalGenerator.h @@ -198,12 +198,14 @@ public: ///! for existing files convert to output path and short path if spaces std::string ConvertToOutputForExisting(const char* remote, - RelativeRoot local = START_OUTPUT); + RelativeRoot local = START_OUTPUT, + OutputFormat format = SHELL); /** For existing path identified by RelativeRoot convert to output path and short path if spaces. */ std::string ConvertToOutputForExisting(RelativeRoot remote, - const char* local = 0); + const char* local = 0, + OutputFormat format = SHELL); virtual std::string ConvertToIncludeReference(std::string const& path); @@ -465,7 +467,8 @@ protected: bool BackwardsCompatibilityFinal; private: std::string ConvertToOutputForExistingCommon(const char* remote, - std::string const& result); + std::string const& result, + OutputFormat format); void AddSharedFlags(std::string& flags, const char* lang, bool shared); bool GetShouldUseOldFlags(bool shared, const std::string &lang) const; |