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

ENH: use native Deployment and Development directories

This commit is contained in:
Bill Hoffman 2005-08-30 13:58:46 -04:00
parent feb2d86f26
commit 62ae06081e
5 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/CTest/cmCTestTestHandler.cxx
View File

@ -927,6 +927,16 @@ std::string cmCTestTestHandler::FindTheExecutable(const char *exe)
if ( m_CTest->GetConfigType() == "" ) if ( m_CTest->GetConfigType() == "" )
{ {
// No config type, so try to guess it // 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")) if (::TryExecutable(dir.c_str(),file.c_str(),&fullPath,"Release"))
{ {
return fullPath; return fullPath;

3
Source/cmGlobalXCodeGenerator.cxx
View File

@ -114,6 +114,7 @@ void cmGlobalXCodeGenerator::EnableLanguage(std::vector<std::string>const&
else else
{ {
mf->AddDefinition("CMAKE_CFG_INTDIR","$(CONFIGURATION)"); mf->AddDefinition("CMAKE_CFG_INTDIR","$(CONFIGURATION)");
mf->AddDefinition("CMAKE_CONFIGURATION_TYPES","Developement;Deployment");
} }
mf->AddDefinition("CMAKE_GENERATOR_CC", "gcc"); mf->AddDefinition("CMAKE_GENERATOR_CC", "gcc");
mf->AddDefinition("CMAKE_GENERATOR_CXX", "g++"); mf->AddDefinition("CMAKE_GENERATOR_CXX", "g++");
@ -174,7 +175,7 @@ std::string cmGlobalXCodeGenerator::GenerateBuildCommand(const char* makeProgram
} }
else else
{ {
makeCommand += " -configuration Debug"; makeCommand += " -configuration Development";
} }
makeCommand += " OBJROOT=."; makeCommand += " OBJROOT=.";
return makeCommand; return makeCommand;

21
Source/cmTryRunCommand.cxx
View File

@ -91,11 +91,22 @@ bool cmTryRunCommand::InitialPass(std::vector<std::string> const& argv)
} }
else else
{ {
cmOStringStream emsg; std::string command3 = binaryDirectory;
emsg << "Unable to find executable for TRY_RUN: tried \"" command3 += "/Development/cmTryCompileExec";
<< command1 << "\" and \"" command3 += cmSystemTools::GetExecutableExtension();
<< command2 << "\"."; if(cmSystemTools::FileExists(command3.c_str()))
cmSystemTools::Error(emsg.str().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) if (fullPath.size() > 1)

1
Tests/LoadCommand/CMakeLists.txt
View File

@ -47,6 +47,7 @@ IF (COMPILE_OK)
LOAD_COMMAND(CMAKE_TEST_COMMAND LOAD_COMMAND(CMAKE_TEST_COMMAND
${LoadedCommand_BINARY_DIR}/CMakeCommands ${LoadedCommand_BINARY_DIR}/CMakeCommands
${LoadedCommand_BINARY_DIR}/CMakeCommands/Debug ${LoadedCommand_BINARY_DIR}/CMakeCommands/Debug
${LoadedCommand_BINARY_DIR}/CMakeCommands/Development
) )
# if the command loaded, execute the command # if the command loaded, execute the command
IF (COMMAND CMAKE_TEST_COMMAND) IF (COMMAND CMAKE_TEST_COMMAND)

1
Tests/LoadCommandOneConfig/CMakeLists.txt
View File

@ -47,6 +47,7 @@ IF (COMPILE_OK)
LOAD_COMMAND(CMAKE_TEST_COMMAND LOAD_COMMAND(CMAKE_TEST_COMMAND
${LoadedCommand_BINARY_DIR}/CMakeCommands ${LoadedCommand_BINARY_DIR}/CMakeCommands
${LoadedCommand_BINARY_DIR}/CMakeCommands/Debug ${LoadedCommand_BINARY_DIR}/CMakeCommands/Debug
${LoadedCommand_BINARY_DIR}/CMakeCommands/Development
) )
# if the command loaded, execute the command # if the command loaded, execute the command
IF (COMMAND CMAKE_TEST_COMMAND) IF (COMMAND CMAKE_TEST_COMMAND)