summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorKen Martin <ken.martin@kitware.com>2007-05-03 19:25:41 (GMT)
committerKen Martin <ken.martin@kitware.com>2007-05-03 19:25:41 (GMT)
commit245083526783edf7c29432a592353329b223a4bd (patch)
tree9b1f7c305d9130cce11100afddbf8c401ca1c0ca /Source
parentaa4d7847ee4bab0c1c6bd8fbb5a516e24f66f701 (diff)
downloadCMake-245083526783edf7c29432a592353329b223a4bd.zip
CMake-245083526783edf7c29432a592353329b223a4bd.tar.gz
CMake-245083526783edf7c29432a592353329b223a4bd.tar.bz2
ENH: look at CMAKE_TRY_COMPILE_CONFIGURATION var for TryRun as well
Diffstat (limited to 'Source')
-rw-r--r--Source/cmTryRunCommand.cxx73
1 files changed, 54 insertions, 19 deletions
diff --git a/Source/cmTryRunCommand.cxx b/Source/cmTryRunCommand.cxx
index f8f2e86..ce991cb 100644
--- a/Source/cmTryRunCommand.cxx
+++ b/Source/cmTryRunCommand.cxx
@@ -76,6 +76,7 @@ bool cmTryRunCommand::InitialPass(std::vector<std::string> const& argv)
int retVal = -1;
std::string output;
std::string command1 = binaryDirectory;
+ std::vector<std::string> attemptedPaths;
command1 += "/cmTryCompileExec";
command1 += cmSystemTools::GetExecutableExtension();
std::string fullPath;
@@ -83,34 +84,68 @@ bool cmTryRunCommand::InitialPass(std::vector<std::string> const& argv)
{
fullPath = cmSystemTools::CollapseFullPath(command1.c_str());
}
- else
+ attemptedPaths.push_back(command1);
+ command1 = binaryDirectory;
+ // try CMAKE_TRY_COMPILE_CONFIGURATION if it is set
+ if (fullPath.empty())
{
- std::string command2 = binaryDirectory;
- command2 += "/Debug/cmTryCompileExec";
- command2 += cmSystemTools::GetExecutableExtension();
- if(cmSystemTools::FileExists(command2.c_str()))
+ const char* config =
+ this->Makefile->GetDefinition("CMAKE_TRY_COMPILE_CONFIGURATION");
+ // if a config was specified try that first
+ if (config && config[0])
{
- fullPath = cmSystemTools::CollapseFullPath(command2.c_str());
+ command1 += "/";
+ command1 += config;
+ command1 += "/cmTryCompileExec";
+ command1 += cmSystemTools::GetExecutableExtension();
+ if(cmSystemTools::FileExists(command1.c_str()))
+ {
+ fullPath = cmSystemTools::CollapseFullPath(command1.c_str());
+ }
+ attemptedPaths.push_back(command1);
}
- else
+ }
+ // try Debug if still not found
+ if (fullPath.empty())
+ {
+ command1 = binaryDirectory;
+ command1 += "/Debug/cmTryCompileExec";
+ command1 += cmSystemTools::GetExecutableExtension();
+ if(cmSystemTools::FileExists(command1.c_str()))
+ {
+ fullPath = cmSystemTools::CollapseFullPath(command1.c_str());
+ }
+ attemptedPaths.push_back(command1);
+ }
+ // try Deployment if still not found
+ if (fullPath.empty())
+ {
+ command1 = binaryDirectory;
+ command1 += "/Development/cmTryCompileExec";
+ command1 += cmSystemTools::GetExecutableExtension();
+ if(cmSystemTools::FileExists(command1.c_str()))
+ {
+ fullPath = cmSystemTools::CollapseFullPath(command1.c_str());
+ }
+ attemptedPaths.push_back(command1);
+ }
+ if (fullPath.empty())
+ {
+ cmOStringStream emsg;
+ emsg << "Unable to find executable for TRY_RUN: tried \"";
+ for (i = 0; i < attemptedPaths.size(); ++i)
{
- std::string command3 = binaryDirectory;
- command3 += "/Development/cmTryCompileExec";
- command3 += cmSystemTools::GetExecutableExtension();
- if(cmSystemTools::FileExists(command3.c_str()))
+ emsg << attemptedPaths[i];
+ if (i < attemptedPaths.size() - 1)
{
- fullPath = cmSystemTools::CollapseFullPath(command3.c_str());
+ emsg << "\" and \"";
}
else
{
- cmOStringStream emsg;
- emsg << "Unable to find executable for TRY_RUN: tried \""
- << command1 << "\" and \""
- << command2 << "\" and \""
- << command3 << "\".";
- cmSystemTools::Error(emsg.str().c_str());
+ emsg << "\".";
}
}
+ cmSystemTools::Error(emsg.str().c_str());
}
if (fullPath.size() > 1)
{
@@ -148,7 +183,7 @@ bool cmTryRunCommand::InitialPass(std::vector<std::string> const& argv)
}
this->Makefile->AddCacheDefinition(argv[0].c_str(), retChar,
"Result of TRY_RUN",
- cmCacheManager::INTERNAL);
+ cmCacheManager::INTERNAL);
}
}