Commit 62ae0608 authored by Bill Hoffman's avatar Bill Hoffman
Browse files

ENH: use native Deployment and Development directories

parent feb2d86f
......@@ -927,6 +927,16 @@ std::string cmCTestTestHandler::FindTheExecutable(const char *exe)
if ( m_CTest->GetConfigType() == "" )
{
// No config type, so try to guess it
if (::TryExecutable(dir.c_str(),file.c_str(),&fullPath,"Deployment"))
{
return fullPath;
}
if (::TryExecutable(dir.c_str(),file.c_str(),&fullPath,"Development"))
{
return fullPath;
}
if (::TryExecutable(dir.c_str(),file.c_str(),&fullPath,"Release"))
{
return fullPath;
......
......@@ -114,6 +114,7 @@ void cmGlobalXCodeGenerator::EnableLanguage(std::vector<std::string>const&
else
{
mf->AddDefinition("CMAKE_CFG_INTDIR","$(CONFIGURATION)");
mf->AddDefinition("CMAKE_CONFIGURATION_TYPES","Developement;Deployment");
}
mf->AddDefinition("CMAKE_GENERATOR_CC", "gcc");
mf->AddDefinition("CMAKE_GENERATOR_CXX", "g++");
......@@ -174,7 +175,7 @@ std::string cmGlobalXCodeGenerator::GenerateBuildCommand(const char* makeProgram
}
else
{
makeCommand += " -configuration Debug";
makeCommand += " -configuration Development";
}
makeCommand += " OBJROOT=.";
return makeCommand;
......
......@@ -91,11 +91,22 @@ bool cmTryRunCommand::InitialPass(std::vector<std::string> const& argv)
}
else
{
cmOStringStream emsg;
emsg << "Unable to find executable for TRY_RUN: tried \""
<< command1 << "\" and \""
<< command2 << "\".";
cmSystemTools::Error(emsg.str().c_str());
std::string command3 = binaryDirectory;
command3 += "/Development/cmTryCompileExec";
command3 += cmSystemTools::GetExecutableExtension();
if(cmSystemTools::FileExists(command3.c_str()))
{
fullPath = cmSystemTools::CollapseFullPath(command3.c_str());
}
else
{
cmOStringStream emsg;
emsg << "Unable to find executable for TRY_RUN: tried \""
<< command1 << "\" and \""
<< command2 << "\" and \""
<< command3 << "\".";
cmSystemTools::Error(emsg.str().c_str());
}
}
}
if (fullPath.size() > 1)
......
......@@ -47,6 +47,7 @@ IF (COMPILE_OK)
LOAD_COMMAND(CMAKE_TEST_COMMAND
${LoadedCommand_BINARY_DIR}/CMakeCommands
${LoadedCommand_BINARY_DIR}/CMakeCommands/Debug
${LoadedCommand_BINARY_DIR}/CMakeCommands/Development
)
# if the command loaded, execute the command
IF (COMMAND CMAKE_TEST_COMMAND)
......
......@@ -47,6 +47,7 @@ IF (COMPILE_OK)
LOAD_COMMAND(CMAKE_TEST_COMMAND
${LoadedCommand_BINARY_DIR}/CMakeCommands
${LoadedCommand_BINARY_DIR}/CMakeCommands/Debug
${LoadedCommand_BINARY_DIR}/CMakeCommands/Development
)
# if the command loaded, execute the command
IF (COMMAND CMAKE_TEST_COMMAND)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment