[cmake-commits] alex committed cmInstallCommand.cxx 1.25 1.26 cmTryRunCommand.cxx 1.38 1.39

cmake-commits at cmake.org cmake-commits at cmake.org
Wed Aug 1 17:10:24 EDT 2007


Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv5610

Modified Files:
	cmInstallCommand.cxx cmTryRunCommand.cxx 
Log Message:

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


Index: cmInstallCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmInstallCommand.cxx,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- cmInstallCommand.cxx	2 Jul 2007 18:56:57 -0000	1.25
+++ cmInstallCommand.cxx	1 Aug 2007 21:10:22 -0000	1.26
@@ -151,9 +151,9 @@
   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<std::string> archive_configurations;
   std::vector<std::string> library_configurations;
@@ -635,7 +635,7 @@
   std::string rename;
   std::string permissions;
   std::vector<std::string> configurations;
-  std::string component;
+  std::string component = "Unspecified";
   bool optional = false;
   for(unsigned int i=1; i < args.size(); ++i)
     {
@@ -824,7 +824,7 @@
   std::string permissions_file;
   std::string permissions_dir;
   std::vector<std::string> configurations;
-  std::string component;
+  std::string component = "Unspecified";
   std::string literal_args;
   for(unsigned int i=1; i < args.size(); ++i)
     {

Index: cmTryRunCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmTryRunCommand.cxx,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- cmTryRunCommand.cxx	1 Aug 2007 15:59:51 -0000	1.38
+++ cmTryRunCommand.cxx	1 Aug 2007 21:10:22 -0000	1.39
@@ -315,8 +315,8 @@
       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 "



More information about the Cmake-commits mailing list