[cmake-commits] alex committed cmInstallCommand.cxx 1.29 1.30
cmInstallCommandArguments.cxx 1.1 1.2
cmInstallCommandArguments.h 1.1 1.2
cmake-commits at cmake.org
cmake-commits at cmake.org
Fri Aug 24 14:27:20 EDT 2007
Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv15811
Modified Files:
cmInstallCommand.cxx cmInstallCommandArguments.cxx
cmInstallCommandArguments.h
Log Message:
STYLE: fix MSVC warnings by making the cmCommandArgumentsHelper a member of
cmInstallCommandArguments instead of deriving from it
Alex
Index: cmInstallCommandArguments.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmInstallCommandArguments.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- cmInstallCommandArguments.h 23 Aug 2007 20:14:18 -0000 1.1
+++ cmInstallCommandArguments.h 24 Aug 2007 18:27:18 -0000 1.2
@@ -21,15 +21,17 @@
#include "cmStandardIncludes.h"
#include "cmCommandArgumentsHelper.h"
-class cmInstallCommandArguments : public cmCommandArgumentsHelper
+class cmInstallCommandArguments
{
public:
cmInstallCommandArguments();
void SetGenericArguments(cmInstallCommandArguments* args)
{this->GenericArguments = args;}
- // Compute destination path.
+ void Parse(const std::vector<std::string>* args,
+ std::vector<std::string>* unconsumedArgs);
+
+ // Compute destination path.and check permissions
bool Finalize();
- cmCommandArgumentGroup ArgumentGroup;
const std::string& GetDestination() const;
const std::string& GetComponent() const;
@@ -45,6 +47,8 @@
std::string& absDest);
static bool CheckPermissions(const std::string& onePerm,
std::string& perm);
+ cmCommandArgumentsHelper Parser;
+ cmCommandArgumentGroup ArgumentGroup;
private:
cmCAString Destination;
cmCAString Component;
Index: cmInstallCommandArguments.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmInstallCommandArguments.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- cmInstallCommandArguments.cxx 23 Aug 2007 20:14:18 -0000 1.1
+++ cmInstallCommandArguments.cxx 24 Aug 2007 18:27:18 -0000 1.2
@@ -29,14 +29,14 @@
const std::string cmInstallCommandArguments::EmptyString;
cmInstallCommandArguments::cmInstallCommandArguments()
-:cmCommandArgumentsHelper()
+:Parser()
,ArgumentGroup()
-,Destination (this, "DESTINATION" , &ArgumentGroup)
-,Component (this, "COMPONENT" , &ArgumentGroup)
-,Rename (this, "RENAME" , &ArgumentGroup)
-,Permissions (this, "PERMISSIONS" , &ArgumentGroup)
-,Configurations(this, "CONFIGURATIONS", &ArgumentGroup)
-,Optional (this, "OPTIONAL" , &ArgumentGroup)
+,Destination (&Parser, "DESTINATION" , &ArgumentGroup)
+,Component (&Parser, "COMPONENT" , &ArgumentGroup)
+,Rename (&Parser, "RENAME" , &ArgumentGroup)
+,Permissions (&Parser, "PERMISSIONS" , &ArgumentGroup)
+,Configurations(&Parser, "CONFIGURATIONS", &ArgumentGroup)
+,Optional (&Parser, "OPTIONAL" , &ArgumentGroup)
,GenericArguments(0)
{
this->Component.SetDefaultString("Unspecified");
@@ -133,6 +133,13 @@
return true;
}
+void cmInstallCommandArguments::Parse(const std::vector<std::string>* args,
+ std::vector<std::string>* unconsumedArgs)
+{
+ this->Parser.Parse(args, unconsumedArgs);
+}
+
+
bool cmInstallCommandArguments::CheckPermissions()
{
this->PermissionsString = "";
Index: cmInstallCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmInstallCommand.cxx,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- cmInstallCommand.cxx 24 Aug 2007 17:30:40 -0000 1.29
+++ cmInstallCommand.cxx 24 Aug 2007 18:27:18 -0000 1.30
@@ -176,8 +176,8 @@
std::vector<std::string> unknownArgs;
cmInstallCommandArguments genericArgs;
- cmCAStringVector targetList(&genericArgs, "TARGETS");
- cmCAString exports(&genericArgs, "EXPORT", &genericArgs.ArgumentGroup);
+ cmCAStringVector targetList(&genericArgs.Parser, "TARGETS");
+ cmCAString exports(&genericArgs.Parser,"EXPORT", &genericArgs.ArgumentGroup);
targetList.Follows(0);
genericArgs.ArgumentGroup.Follows(&targetList);
genericArgs.Parse(&genericArgVector.GetVector(), &unknownArgs);
@@ -509,7 +509,7 @@
// This is the FILES mode.
bool programs = (args[0] == "PROGRAMS");
cmInstallCommandArguments ica;
- cmCAStringVector files(&ica, programs ? "PROGRAMS" : "FILES");
+ cmCAStringVector files(&ica.Parser, programs ? "PROGRAMS" : "FILES");
files.Follows(0);
ica.ArgumentGroup.Follows(&files);
std::vector<std::string> unknownArgs;
@@ -954,9 +954,9 @@
{
// This is the EXPORT mode.
cmInstallCommandArguments ica;
- cmCAStringVector exports(&ica, "EXPORT");
- cmCAString prefix(&ica, "PREFIX", &ica.ArgumentGroup);
- cmCAString filename(&ica, "FILENAME", &ica.ArgumentGroup);
+ cmCAStringVector exports(&ica.Parser, "EXPORT");
+ cmCAString prefix(&ica.Parser, "PREFIX", &ica.ArgumentGroup);
+ cmCAString filename(&ica.Parser, "FILENAME", &ica.ArgumentGroup);
exports.Follows(0);
ica.ArgumentGroup.Follows(&exports);
More information about the Cmake-commits
mailing list