diff options
| author | Brad King <brad.king@kitware.com> | 2012-07-11 15:03:21 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2012-07-11 15:10:40 -0400 |
| commit | 8720aa0496bad1381a6636a3c4a6d5d550381960 (patch) | |
| tree | 68ffe5cf57608b695ca5e1c10b33ad4f65afa60e /Source/cmCommandArgumentsHelper.h | |
| parent | b71e731b9b91f9f79ab49838baae5bb5ab42c30e (diff) | |
| download | cmake-8720aa0496bad1381a6636a3c4a6d5d550381960.tar.gz | |
install: Fix COMPONENT option
Since commit 7ced0732 (make default install component name configurable,
2012-05-13) the COMPONENT option has not worked in all cases. The
change restored use of the broken SetDefaultString previously removed by
commit 43cad3e4 (fix the default "Unspecified" component, 2008-03-26).
Remove SetDefaultString and use the default component name only when an
invocation does not specify a non-empty COMPONENT option value.
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=680825
Diffstat (limited to 'Source/cmCommandArgumentsHelper.h')
| -rw-r--r-- | Source/cmCommandArgumentsHelper.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/Source/cmCommandArgumentsHelper.h b/Source/cmCommandArgumentsHelper.h index cb33ccd4ba..3b0b058fd5 100644 --- a/Source/cmCommandArgumentsHelper.h +++ b/Source/cmCommandArgumentsHelper.h @@ -125,11 +125,8 @@ class cmCAString : public cmCommandArgument /// Return the string const std::string& GetString() const {return this->String;} const char* GetCString() const {return this->String.c_str();} - void SetDefaultString(const char* text) - {this->DefaultString = (text ? text : "");} private: std::string String; - std::string DefaultString; unsigned int DataStart; virtual bool DoConsume(const std::string& arg, unsigned int index); virtual void DoReset(); |