From 8720aa0496bad1381a6636a3c4a6d5d550381960 Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 11 Jul 2012 15:03:21 -0400 Subject: 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 --- Source/cmCommandArgumentsHelper.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source/cmCommandArgumentsHelper.cxx') diff --git a/Source/cmCommandArgumentsHelper.cxx b/Source/cmCommandArgumentsHelper.cxx index 1c906a65ce..d92013788a 100644 --- a/Source/cmCommandArgumentsHelper.cxx +++ b/Source/cmCommandArgumentsHelper.cxx @@ -178,7 +178,7 @@ bool cmCAString::DoConsume(const std::string& arg, unsigned int index) void cmCAString::DoReset() { - this->String = this->DefaultString; + this->String = ""; } cmCAEnabler::cmCAEnabler(cmCommandArgumentsHelper* args, -- cgit v1.2.1