[cmake-commits] alex committed cmInstallCommand.cxx 1.27 1.28

[cmake-commits at cmake.org]

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

Modified Files:
	cmInstallCommand.cxx 
Log Message:

ENH: use cmCommandArgumentHelper for INSTALL(TARGETS, FILES, PROGRAMS,
EXPORTS), saves a lot of code. INSTALL(DIRECTORY) is still done the old way,
since this seems to be quite complicated
-for INSTALL(TARGETS ): also parse PUBLIC_HEADER, PRIVATE_HEADER, RESOURCE

Alex


Index: cmInstallCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmInstallCommand.cxx,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- cmInstallCommand.cxx	22 Aug 2007 15:32:48 -0000	1.27
+++ cmInstallCommand.cxx	24 Aug 2007 12:55:20 -0000	1.28
@@ -21,9 +21,30 @@
 #include "cmInstallScriptGenerator.h"
 #include "cmInstallTargetGenerator.h"
 #include "cmInstallExportGenerator.h"
+#include "cmInstallCommandArguments.h"
 
 #include <cmsys/Glob.hxx>
 
+static cmInstallTargetGenerator* CreateInstallTargetGenerator(cmTarget& target,
+     const cmInstallCommandArguments& args, bool impLib, bool forceOpt = false)
+{
+  return new cmInstallTargetGenerator(target, args.GetDestination().c_str(), 
[...1280 lines suppressed...]
-      "GROUP_READ", "GROUP_WRITE", "GROUP_EXECUTE",
-      "WORLD_READ", "WORLD_WRITE", "WORLD_EXECUTE",
-      "SETUID", "SETGID", 0
-    };
-
-  // Check the permission against the table.
-  for(const char** valid = table; *valid; ++valid)
-    {
-    if(arg == *valid)
-      {
-      // This is a valid permission.
-      permissions += " ";
-      permissions += arg;
-      return true;
-      }
-    }
-
-  // This is not a valid permission.
-  return false;
-}