[Cmake-commits] [cmake-commits] king committed cmGlobalGenerator.cxx 1.251 1.252 cmGlobalGenerator.h 1.119 1.120

[cmake-commits at cmake.org]

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

Modified Files:
	cmGlobalGenerator.cxx cmGlobalGenerator.h 
Log Message:
ENH: Extend GG::Build method for pre-parsed args

This adds an argument to the cmGlobalGenerator::Build method to pass a
vector of arguments for the native build tool programatically.


Index: cmGlobalGenerator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalGenerator.h,v
retrieving revision 1.119
retrieving revision 1.120
diff -C 2 -d -r1.119 -r1.120
*** cmGlobalGenerator.h	27 Feb 2009 16:23:14 -0000	1.119
--- cmGlobalGenerator.h	4 Mar 2009 20:38:47 -0000	1.120
***************
*** 101,111 ****
     * done first.
     */
!   virtual int Build(const char *srcdir, const char *bindir,
!                     const char *projectName, const char *targetName,
!                     std::string *output, 
!                     const char *makeProgram, const char *config,
!                     bool clean, bool fast,
!                     double timeout, bool verbose=false,
!                     const char* extraOptions = 0);
    
    virtual std::string GenerateBuildCommand(
--- 101,113 ----
     * done first.
     */
!   int Build(const char *srcdir, const char *bindir,
!             const char *projectName, const char *targetName,
!             std::string *output,
!             const char *makeProgram, const char *config,
!             bool clean, bool fast,
!             double timeout, bool verbose=false,
!             const char* extraOptions = 0,
!             std::vector<std::string> const& nativeOptions =
!             std::vector<std::string>());
    
    virtual std::string GenerateBuildCommand(

Index: cmGlobalGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalGenerator.cxx,v
retrieving revision 1.251
retrieving revision 1.252
diff -C 2 -d -r1.251 -r1.252
*** cmGlobalGenerator.cxx	27 Feb 2009 16:23:14 -0000	1.251
--- cmGlobalGenerator.cxx	4 Mar 2009 20:38:46 -0000	1.252
***************
*** 1126,1130 ****
    double timeout,
    bool verbose,
!   const char* extraOptions)
  {
    /**
--- 1126,1131 ----
    double timeout,
    bool verbose,
!   const char* extraOptions,
!   std::vector<std::string> const& nativeOptions)
  {
    /**
***************
*** 1195,1200 ****
      *output += "\n";
      }
!   
!   if (!cmSystemTools::RunSingleCommand(makeCommand.c_str(), outputPtr,
                                         &retVal, 0, verbose, timeout))
      {
--- 1196,1209 ----
      *output += "\n";
      }
! 
!   std::vector<cmStdString> command =
!     cmSystemTools::ParseArguments(makeCommand.c_str());
!   for(std::vector<std::string>::const_iterator ni = nativeOptions.begin();
!       ni != nativeOptions.end(); ++ni)
!     {
!     command.push_back(*ni);
!     }
! 
!   if (!cmSystemTools::RunSingleCommand(command, outputPtr,
                                         &retVal, 0, verbose, timeout))
      {