diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2008-03-26 22:30:34 (GMT) |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2008-03-26 22:30:34 (GMT) |
| commit | 43cad3e4a54542dce758e2c0f3ea4aef7356ac14 (patch) | |
| tree | c2df84560f14a484eddf16e53ffa77ebd2e15110 /Source | |
| parent | 12e64fb9c2ea2abc254ff1c45f4bdcae72c722d2 (diff) | |
| download | CMake-43cad3e4a54542dce758e2c0f3ea4aef7356ac14.zip CMake-43cad3e4a54542dce758e2c0f3ea4aef7356ac14.tar.gz CMake-43cad3e4a54542dce758e2c0f3ea4aef7356ac14.tar.bz2 | |
BUG: fix the default "Unspecified" component when only the generic (i.e. not
RUNTIME, ARCHIVE, LIBRARY, etc.) arguments are given.
If the component of a part of a target is queried, return the specific one,
if a specific one hasn't been set, return the generic one, if that hasn't
been set, return "Unspecified".
Alex
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmInstallCommandArguments.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmInstallCommandArguments.cxx b/Source/cmInstallCommandArguments.cxx index ddfd9d4..64dd965 100644 --- a/Source/cmInstallCommandArguments.cxx +++ b/Source/cmInstallCommandArguments.cxx @@ -40,9 +40,7 @@ cmInstallCommandArguments::cmInstallCommandArguments() ,NamelinkOnly (&Parser, "NAMELINK_ONLY" , &ArgumentGroup) ,NamelinkSkip (&Parser, "NAMELINK_SKIP" , &ArgumentGroup) ,GenericArguments(0) -{ - this->Component.SetDefaultString("Unspecified"); -} +{} const std::string& cmInstallCommandArguments::GetDestination() const { @@ -67,7 +65,9 @@ const std::string& cmInstallCommandArguments::GetComponent() const { return this->GenericArguments->GetComponent(); } - return this->EmptyString; + + static std::string unspecifiedComponent = "Unspecified"; + return unspecifiedComponent; } const std::string& cmInstallCommandArguments::GetRename() const |