kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

updated signature

This commit is contained in:
Ken Martin 2002-09-10 16:52:56 -04:00
parent bea21587cf
commit 5608a9a129
2 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Source/cmTryCompileCommand.cxx
View File

@ -20,17 +20,26 @@
// cmExecutableCommand // cmExecutableCommand
bool cmTryCompileCommand::InitialPass(std::vector<std::string> const& argv) bool cmTryCompileCommand::InitialPass(std::vector<std::string> const& argv)
{ {
if(argv.size() < 3) if(argv.size() < 4)
{ {
return true; return false;
} }
const char* sourceDirectory = argv[0].c_str(); const char* sourceDirectory = argv[1].c_str();
const char* binaryDirectory = argv[1].c_str(); const char* binaryDirectory = argv[2].c_str();
const char* projectName = argv[2].c_str(); const char* projectName = argv[3].c_str();
const char* targetName = 0;
m_Makefile->TryCompile(sourceDirectory,binaryDirectory,projectName); if (argv.size() == 5)
{
targetName = argv[4].c_str();
}
int res = m_Makefile->TryCompile(sourceDirectory, binaryDirectory,
projectName, targetName);
// set the result var to the return value to indicate success or failure
m_Makefile->AddDefinition(argv[0].c_str(), (res == 0 ? "TRUE" : "FALSE"));
return true; return true;
} }

10
Source/cmTryCompileCommand.h
View File

@ -62,16 +62,14 @@ public:
virtual const char* GetFullDocumentation() virtual const char* GetFullDocumentation()
{ {
return return
"TRY_COMPILE(RESULT_VAR CMakeListFile )\n" "TRY_COMPILE(RESULT_VAR srcdir bindir projectName <targetName>)\n"
"TRY_COMPILE(RESULT_VAR sourceCode)\n" "Try compiling a program. Return the success or failure in RESULT_VAR "
"Try compiling a program. Return the success or failure in result"; "If <target name> is specified then build just that target "
"otherwise the all or ALL_BUILD target is built.";
} }
cmTypeMacro(cmTryCompileCommand, cmCommand); cmTypeMacro(cmTryCompileCommand, cmCommand);
private:
std::string m_TargetName;
std::vector<std::string> m_FinalArgs;
}; };