浏览代码

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.
Brad King 16 年之前
父节点
当前提交
80c947b397

+ 1 - 0
Source/cmCoreTryCompile.cxx

@@ -297,6 +297,7 @@ int cmCoreTryCompile::TryCompileCode(std::vector<std::string> const& argv)
                                        this->BinaryDirectory.c_str(),
                                        projectName, 
                                        targetName, 
+                                       this->SrcFileSignature,
                                        &cmakeFlags, 
                                        &output);
   if ( erroroc )

+ 2 - 2
Source/cmGlobalGenerator.cxx

@@ -1026,7 +1026,7 @@ void cmGlobalGenerator::CheckLocalGenerators()
 
 int cmGlobalGenerator::TryCompile(const char *srcdir, const char *bindir,
                                   const char *projectName,
-                                  const char *target,
+                                  const char *target, bool fast,
                                   std::string *output, cmMakefile *mf)
 {
   // if this is not set, then this is a first time configure
@@ -1077,7 +1077,7 @@ int cmGlobalGenerator::TryCompile(const char *srcdir, const char *bindir,
   const char* config = mf->GetDefinition("CMAKE_TRY_COMPILE_CONFIGURATION");
   return this->Build(srcdir,bindir,projectName,
                      newTarget.c_str(),
-                     output,makeCommand.c_str(),config,false,true,
+                     output,makeCommand.c_str(),config,false,fast,
                      this->TryCompileTimeout);
 }
 

+ 1 - 1
Source/cmGlobalGenerator.h

@@ -91,7 +91,7 @@ public:
    */
   virtual int TryCompile(const char *srcdir, const char *bindir,
                          const char *projectName, const char *targetName,
-                         std::string *output, cmMakefile* mf);
+                         bool fast, std::string *output, cmMakefile* mf);
 
   
   /**

+ 2 - 0
Source/cmMakefile.cxx

@@ -2728,6 +2728,7 @@ void cmMakefile::ExpandSourceListArguments(
 
 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)
 {
@@ -2808,6 +2809,7 @@ int cmMakefile::TryCompile(const char *srcdir, const char *bindir,
     this->LocalGenerator->GetGlobalGenerator()->TryCompile(srcdir,bindir,
                                                            projectName,
                                                            targetName,
+                                                           fast,
                                                            output,
                                                            this);
 

+ 1 - 0
Source/cmMakefile.h

@@ -121,6 +121,7 @@ public:
    */
   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);
     

+ 3 - 2
Tests/TryCompile/CMakeLists.txt

@@ -110,8 +110,9 @@ MESSAGE("Testing try_compile project mode")
 TRY_COMPILE(TEST_INNER
   ${TryCompile_BINARY_DIR}/CMakeFiles/Inner
   ${TryCompile_SOURCE_DIR}/Inner
-  TryCompileInner)
-TEST_ASSERT(TEST_INNER "try_compile project mode failed")
+  TryCompileInner innerexe
+  OUTPUT_VARIABLE output)
+TEST_ASSERT(TEST_INNER "try_compile project mode failed:\n${output}")
 
 ADD_EXECUTABLE(TryCompile pass.c)
 

+ 3 - 1
Tests/TryCompile/Inner/CMakeLists.txt

@@ -10,4 +10,6 @@ if(NOT SHOULD_PASS)
   message(FATAL_ERROR "Inner try-compile SHOULD_PASS failed!")
 endif()
 
-add_executable(inner ../pass.c)
+add_library(innerlib innerlib.c)
+add_executable(innerexe innerexe.c)
+target_link_libraries(innerexe innerlib)

+ 2 - 0
Tests/TryCompile/Inner/innerexe.c

@@ -0,0 +1,2 @@
+extern int innerlib(void);
+int main() { return innerlib(); }

+ 1 - 0
Tests/TryCompile/Inner/innerlib.c

@@ -0,0 +1 @@
+int innerlib(void) { return 0; }