[Cmake-commits] [cmake-commits] king committed cmCoreTryCompile.cxx 1.13 1.14 cmGlobalGenerator.cxx 1.255 1.256 cmGlobalGenerator.h 1.124 1.125 cmMakefile.cxx 1.515 1.516 cmMakefile.h 1.256 1.257

[cmake-commits at cmake.org]

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

Modified Files:
	cmCoreTryCompile.cxx cmGlobalGenerator.cxx cmGlobalGenerator.h 
	cmMakefile.cxx cmMakefile.h 
Log Message:
No /fast targets in try_compile project mode

The try_compile command builds the cmTryCompileExec executable using the
cmTryCompileExec/fast target with Makefile generators in order to save
time since dependencies are not needed.  However, in project mode the
command builds an entire source tree that may have dependencies.
Therefore we can use the /fast target approach only in one-source mode.


Index: cmGlobalGenerator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalGenerator.h,v
retrieving revision 1.124
retrieving revision 1.125
diff -C 2 -d -r1.124 -r1.125
*** cmGlobalGenerator.h	3 Aug 2009 17:37:36 -0000	1.124
--- cmGlobalGenerator.h	4 Aug 2009 18:37:46 -0000	1.125
***************
*** 92,96 ****
    virtual int TryCompile(const char *srcdir, const char *bindir,
                           const char *projectName, const char *targetName,
!                          std::string *output, cmMakefile* mf);
  
    
--- 92,96 ----
    virtual int TryCompile(const char *srcdir, const char *bindir,
                           const char *projectName, const char *targetName,
!                          bool fast, std::string *output, cmMakefile* mf);
  
    

Index: cmCoreTryCompile.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmCoreTryCompile.cxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -C 2 -d -r1.13 -r1.14
*** cmCoreTryCompile.cxx	19 May 2009 15:25:28 -0000	1.13
--- cmCoreTryCompile.cxx	4 Aug 2009 18:37:46 -0000	1.14
***************
*** 298,301 ****
--- 298,302 ----
                                         projectName, 
                                         targetName, 
+                                        this->SrcFileSignature,
                                         &cmakeFlags, 
                                         &output);

Index: cmGlobalGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalGenerator.cxx,v
retrieving revision 1.255
retrieving revision 1.256
diff -C 2 -d -r1.255 -r1.256
*** cmGlobalGenerator.cxx	3 Aug 2009 17:37:35 -0000	1.255
--- cmGlobalGenerator.cxx	4 Aug 2009 18:37:46 -0000	1.256
***************
*** 1027,1031 ****
  int cmGlobalGenerator::TryCompile(const char *srcdir, const char *bindir,
                                    const char *projectName,
!                                   const char *target,
                                    std::string *output, cmMakefile *mf)
  {
--- 1027,1031 ----
  int cmGlobalGenerator::TryCompile(const char *srcdir, const char *bindir,
                                    const char *projectName,
!                                   const char *target, bool fast,
                                    std::string *output, cmMakefile *mf)
  {
***************
*** 1078,1082 ****
    return this->Build(srcdir,bindir,projectName,
                       newTarget.c_str(),
!                      output,makeCommand.c_str(),config,false,true,
                       this->TryCompileTimeout);
  }
--- 1078,1082 ----
    return this->Build(srcdir,bindir,projectName,
                       newTarget.c_str(),
!                      output,makeCommand.c_str(),config,false,fast,
                       this->TryCompileTimeout);
  }

Index: cmMakefile.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefile.h,v
retrieving revision 1.256
retrieving revision 1.257
diff -C 2 -d -r1.256 -r1.257
*** cmMakefile.h	22 Jul 2009 18:22:45 -0000	1.256
--- cmMakefile.h	4 Aug 2009 18:37:46 -0000	1.257
***************
*** 122,125 ****
--- 122,126 ----
    int TryCompile(const char *srcdir, const char *bindir, 
                   const char *projectName, const char *targetName,
+                  bool fast,
                   const std::vector<std::string> *cmakeArgs,
                   std::string *output);

Index: cmMakefile.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefile.cxx,v
retrieving revision 1.515
retrieving revision 1.516
diff -C 2 -d -r1.515 -r1.516
*** cmMakefile.cxx	24 Jul 2009 17:31:34 -0000	1.515
--- cmMakefile.cxx	4 Aug 2009 18:37:46 -0000	1.516
***************
*** 2729,2732 ****
--- 2729,2733 ----
  int cmMakefile::TryCompile(const char *srcdir, const char *bindir,
                             const char *projectName, const char *targetName,
+                            bool fast,
                             const std::vector<std::string> *cmakeArgs,
                             std::string *output)
***************
*** 2809,2812 ****
--- 2810,2814 ----
                                                             projectName,
                                                             targetName,
+                                                            fast,
                                                             output,
                                                             this);