[cmake-commits] alex committed cmTryCompileCommand.cxx 1.60 1.61
cmTryCompileCommand.h 1.20 1.21 cmTryRunCommand.cxx 1.25 1.26
cmake-commits at cmake.org
cmake-commits at cmake.org
Thu May 24 08:56:16 EDT 2007
Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv9092
Modified Files:
cmTryCompileCommand.cxx cmTryCompileCommand.h
cmTryRunCommand.cxx
Log Message:
ENH: move output file search to cmTryCompileCommand.cxx, so it can be used
there too... many public static functions with lots of arguments... :-/
Alex
Index: cmTryCompileCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmTryCompileCommand.cxx,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- cmTryCompileCommand.cxx 5 Mar 2007 14:50:53 -0000 1.60
+++ cmTryCompileCommand.cxx 24 May 2007 12:56:14 -0000 1.61
@@ -22,7 +22,8 @@
#include <cmsys/Directory.hxx>
int cmTryCompileCommand::CoreTryCompileCode(
- cmMakefile *mf, std::vector<std::string> const& argv, bool clean)
+ cmMakefile *mf, std::vector<std::string> const& argv, bool clean,
+ const char* cmakeCommand, std::string& outputFile)
{
// which signature were we called with ?
bool srcFileSignature = false;
@@ -257,11 +258,18 @@
}
// if They specified clean then we clean up what we can
- if (srcFileSignature && clean)
- {
- if(!mf->GetCMakeInstance()->GetDebugTryCompile())
- {
- cmTryCompileCommand::CleanupFiles(binaryDirectory);
+ if (srcFileSignature)
+ {
+ std::string errorMessage;
+ outputFile = cmTryCompileCommand::GetOutputFile(mf, binaryDirectory,
+ targetName, cmakeCommand,
+ errorMessage);
+ if (clean)
+ {
+ if(!mf->GetCMakeInstance()->GetDebugTryCompile())
+ {
+ cmTryCompileCommand::CleanupFiles(binaryDirectory);
+ }
}
}
return res;
@@ -275,7 +283,9 @@
return false;
}
- cmTryCompileCommand::CoreTryCompileCode(this->Makefile,argv,true);
+ std::string dummy;
+ cmTryCompileCommand::CoreTryCompileCode(this->Makefile,argv, true,
+ this->GetName(), dummy);
return true;
}
@@ -330,3 +340,62 @@
}
}
}
+
+const char* cmTryCompileCommand::GetOutputFile(cmMakefile* mf,
+ const char* binaryDirectory,
+ const char* targetName,
+ const char* cmakeCommand,
+ std::string& errorMessage)
+{
+ errorMessage = "";
+ std::string outputFile = "/";
+ outputFile += targetName;
+ outputFile += mf->GetSafeDefinition("CMAKE_EXECUTABLE_SUFFIX");
+
+ // a list of directories where to search for the compilation result
+ // at first directly in the binary dir
+ std::vector<std::string> searchDirs;
+ searchDirs.push_back("");
+
+ const char* config = mf->GetDefinition("CMAKE_TRY_COMPILE_CONFIGURATION");
+ // if a config was specified try that first
+ if (config && config[0])
+ {
+ std::string tmp = "/";
+ tmp += config;
+ searchDirs.push_back(tmp);
+ }
+ searchDirs.push_back("/Debug");
+ searchDirs.push_back("/Development");
+
+ for(std::vector<std::string>::const_iterator it = searchDirs.begin();
+ it != searchDirs.end();
+ ++it)
+ {
+ std::string command = binaryDirectory;
+ command += *it;
+ command += outputFile;
+ if(cmSystemTools::FileExists(command.c_str()))
+ {
+ outputFile = cmSystemTools::CollapseFullPath(command.c_str());
+ return outputFile.c_str();
+ }
+ }
+
+ cmOStringStream emsg;
+ emsg << "Unable to find executable for " << cmakeCommand << ": tried \"";
+ for (unsigned int i = 0; i < searchDirs.size(); ++i)
+ {
+ emsg << binaryDirectory << searchDirs[i] << outputFile;
+ if (i < searchDirs.size() - 1)
+ {
+ emsg << "\" and \"";
+ }
+ else
+ {
+ emsg << "\".";
+ }
+ }
+ errorMessage = emsg.str();
+ return "";
+}
Index: cmTryCompileCommand.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmTryCompileCommand.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- cmTryCompileCommand.h 18 May 2007 13:30:21 -0000 1.20
+++ cmTryCompileCommand.h 24 May 2007 12:56:14 -0000 1.21
@@ -59,8 +59,11 @@
* commands, such as TryRun can access the same logic without
* duplication.
*/
- static int CoreTryCompileCode(
- cmMakefile *mf, std::vector<std::string> const& argv, bool clean);
+ static int CoreTryCompileCode(cmMakefile *mf,
+ std::vector<std::string> const& argv,
+ bool clean,
+ const char* cmakeCommand,
+ std::string& outputFile);
/**
* This deletes all the files created by TRY_COMPILE or TRY_RUN
@@ -68,7 +71,15 @@
* dependencies of makefiles.
*/
static void CleanupFiles(const char* binDir);
-
+
+ /**
+ * This tries to find the (executable) file created by TRY_COMPILE or
+ * TRY_RUN. If nothing is found an empty string will be returned.
+ */
+ static const char* GetOutputFile(cmMakefile* mf, const char* binaryDirectory,
+ const char* targetName, const char* cmakeCommand,
+ std::string& errorMessage);
+
/**
* More documentation. */
virtual const char* GetFullDocumentation()
Index: cmTryRunCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmTryRunCommand.cxx,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- cmTryRunCommand.cxx 18 May 2007 12:49:06 -0000 1.25
+++ cmTryRunCommand.cxx 24 May 2007 12:56:14 -0000 1.26
@@ -71,140 +71,62 @@
}
}
// do the try compile
- int res = cmTryCompileCommand::CoreTryCompileCode(this->Makefile,
- tryCompile, false);
-
+ std::string fullPath;
+ int res = cmTryCompileCommand::CoreTryCompileCode(this->Makefile, tryCompile,
+ false, this->GetName(), fullPath);
+
// now try running the command if it compiled
- std::string binaryDirectory = argv[2];
- binaryDirectory += cmake::GetCMakeFilesDirectory();
- binaryDirectory += "/CMakeTmp";
- if (!res)
+ if (!res==0)
+ {
+ if (fullPath.size() > 0)
{
int retVal = -1;
std::string output;
- std::string executableSuffix=this->Makefile->GetDefinition(
- "CMAKE_EXECUTABLE_SUFFIX");
- std::string command1 = binaryDirectory;
- std::vector<std::string> attemptedPaths;
- command1 += "/cmTryCompileExec";
- command1 += executableSuffix;
- std::string fullPath;
- if(cmSystemTools::FileExists(command1.c_str()))
- {
- fullPath = cmSystemTools::CollapseFullPath(command1.c_str());
- }
- attemptedPaths.push_back(command1);
- command1 = binaryDirectory;
- // try CMAKE_TRY_COMPILE_CONFIGURATION if it is set
- if (fullPath.empty())
- {
- const char* config =
- this->Makefile->GetDefinition("CMAKE_TRY_COMPILE_CONFIGURATION");
- // if a config was specified try that first
- if (config && config[0])
- {
- command1 += "/";
- command1 += config;
- command1 += "/cmTryCompileExec";
- command1 += executableSuffix;
- if(cmSystemTools::FileExists(command1.c_str()))
- {
- fullPath = cmSystemTools::CollapseFullPath(command1.c_str());
- }
- attemptedPaths.push_back(command1);
- }
- }
- // try Debug if still not found
- if (fullPath.empty())
+ std::string finalCommand = fullPath;
+ finalCommand = cmSystemTools::ConvertToRunCommandPath(fullPath.c_str());
+ if(runArgs.size())
{
- command1 = binaryDirectory;
- command1 += "/Debug/cmTryCompileExec";
- command1 += executableSuffix;
- if(cmSystemTools::FileExists(command1.c_str()))
- {
- fullPath = cmSystemTools::CollapseFullPath(command1.c_str());
- }
- attemptedPaths.push_back(command1);
+ finalCommand += runArgs;
}
- // try Deployment if still not found
- if (fullPath.empty())
+ int timeout = 0;
+ bool worked = cmSystemTools::RunSingleCommand(finalCommand.c_str(),
+ &output, &retVal,
+ 0, false, timeout);
+ if(outputVariable.size())
{
- command1 = binaryDirectory;
- command1 += "/Development/cmTryCompileExec";
- command1 += executableSuffix;
- if(cmSystemTools::FileExists(command1.c_str()))
+ // if the TryCompileCore saved output in this outputVariable then
+ // prepend that output to this output
+ const char* compileOutput
+ = this->Makefile->GetDefinition(outputVariable.c_str());
+ if(compileOutput)
{
- fullPath = cmSystemTools::CollapseFullPath(command1.c_str());
+ output = std::string(compileOutput) + output;
}
- attemptedPaths.push_back(command1);
+ this->Makefile->AddDefinition(outputVariable.c_str(), output.c_str());
}
- if (fullPath.empty())
+ // set the run var
+ char retChar[1000];
+ if(worked)
{
- cmOStringStream emsg;
- emsg << "Unable to find executable for TRY_RUN: tried \"";
- for (i = 0; i < attemptedPaths.size(); ++i)
- {
- emsg << attemptedPaths[i];
- if (i < attemptedPaths.size() - 1)
- {
- emsg << "\" and \"";
- }
- else
- {
- emsg << "\".";
- }
- }
- cmSystemTools::Error(emsg.str().c_str());
+ sprintf(retChar,"%i",retVal);
}
- if (fullPath.size() > 1)
+ else
{
- std::string finalCommand = fullPath;
- finalCommand = cmSystemTools::ConvertToRunCommandPath(fullPath.c_str());
- if(runArgs.size())
- {
- finalCommand += runArgs;
- }
- int timeout = 0;
- bool worked = cmSystemTools::RunSingleCommand(finalCommand.c_str(),
- &output, &retVal,
- 0, false, timeout);
- if(outputVariable.size())
- {
- // if the TryCompileCore saved output in this outputVariable then
- // prepend that output to this output
- const char* compileOutput
- = this->Makefile->GetDefinition(outputVariable.c_str());
- if(compileOutput)
- {
- output = std::string(compileOutput) + output;
- }
- this->Makefile->AddDefinition(outputVariable.c_str(), output.c_str());
- }
- // set the run var
- char retChar[1000];
- if(worked)
- {
- sprintf(retChar,"%i",retVal);
- }
- else
- {
- strcpy(retChar, "FAILED_TO_RUN");
- }
- this->Makefile->AddCacheDefinition(argv[0].c_str(), retChar,
- "Result of TRY_RUN",
- cmCacheManager::INTERNAL);
+ strcpy(retChar, "FAILED_TO_RUN");
}
+ this->Makefile->AddCacheDefinition(argv[0].c_str(), retChar,
+ "Result of TRY_RUN",
+ cmCacheManager::INTERNAL);
}
-
- // if we created a directory etc, then cleanup after ourselves
- std::string cacheFile = binaryDirectory;
- cacheFile += "/CMakeLists.txt";
+ }
+
+ // if we created a directory etc, then cleanup after ourselves
if(!this->Makefile->GetCMakeInstance()->GetDebugTryCompile())
{
+ std::string binaryDirectory = argv[2];
+ binaryDirectory += cmake::GetCMakeFilesDirectory();
+ binaryDirectory += "/CMakeTmp";
cmTryCompileCommand::CleanupFiles(binaryDirectory.c_str());
}
return true;
}
-
-
-
More information about the Cmake-commits
mailing list