From 8046390f1e01cafbaa8aadba238928d874ce91bf Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Wed, 1 Aug 2007 17:10:22 -0400 Subject: ENH: if no COMPONENT is specified, make this install item part of the "Unspecified" component -> if no components are used at all, no change in behaviour, if components are used completely, no change in behaviour, since this default will be overridden everywhere, if components where used partly, it is now possible to install only the unspecified items (e.g. everything which wasn't marked as "Development") Alex Alex --- Source/cmInstallCommand.cxx | 10 +++++----- Source/cmTryRunCommand.cxx | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Source/cmInstallCommand.cxx b/Source/cmInstallCommand.cxx index 9883698..5de168b 100644 --- a/Source/cmInstallCommand.cxx +++ b/Source/cmInstallCommand.cxx @@ -151,9 +151,9 @@ bool cmInstallCommand::HandleTargetsMode(std::vector const& args) std::string archive_permissions; std::string library_permissions; std::string runtime_permissions; - std::string archive_component; - std::string library_component; - std::string runtime_component; + std::string archive_component = "Unspecified"; + std::string library_component = "Unspecified"; + std::string runtime_component = "Unspecified"; std::string exportName; std::vector archive_configurations; std::vector library_configurations; @@ -635,7 +635,7 @@ bool cmInstallCommand::HandleFilesMode(std::vector const& args) std::string rename; std::string permissions; std::vector configurations; - std::string component; + std::string component = "Unspecified"; bool optional = false; for(unsigned int i=1; i < args.size(); ++i) { @@ -824,7 +824,7 @@ cmInstallCommand::HandleDirectoryMode(std::vector const& args) std::string permissions_file; std::string permissions_dir; std::vector configurations; - std::string component; + std::string component = "Unspecified"; std::string literal_args; for(unsigned int i=1; i < args.size(); ++i) { diff --git a/Source/cmTryRunCommand.cxx b/Source/cmTryRunCommand.cxx index 0291595..d702c5a 100644 --- a/Source/cmTryRunCommand.cxx +++ b/Source/cmTryRunCommand.cxx @@ -315,8 +315,8 @@ void cmTryRunCommand::DoNotRunExecutable(const std::string& runArgs, std::string comment ="\n"; comment += this->RunResultVariable; comment += "\n indicates whether the executable would have been able " - "to run if it was\n" - " executed on its target platform. If so, set "; + "to run on its\n" + " target platform. If so, set "; comment += this->RunResultVariable; comment += " to\n" " the exit code (in many cases 0 for success), otherwise " -- cgit v0.12