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

ENH: removed TARGET_DIR_PREFIX support and someother fix

Browse Source
This commit is contained in:
Ken Martin 2005-12-13 15:14:08 -05:00
parent 0b69b892ed
commit c3c349109b
1 changed files with 3 additions and 10 deletions

13
Source/cmLocalUnixMakefileGenerator3.cxx

@ -1980,16 +1980,7 @@ cmLocalUnixMakefileGenerator3
std::string std::string
cmLocalUnixMakefileGenerator3::GetTargetDirectory(cmTarget& target) cmLocalUnixMakefileGenerator3::GetTargetDirectory(cmTarget& target)
{ {
std::string dir; std::string dir = "CMakeFiles/";
// Put a prefix on the name if one is given by the CMake code.
if(const char* prefix = m_Makefile->GetDefinition("CMAKE_TARGET_DIR_PREFIX"))
{
dir += prefix;
}
else
{
dir = "CMakeFiles/";
}
dir += target.GetName(); dir += target.GetName();
dir += ".dir"; dir += ".dir";
return dir; return dir;
@ -2881,6 +2872,8 @@ void cmLocalUnixMakefileGenerator3
depends.clear(); depends.clear();
commands.clear(); commands.clear();
std::string cmakefileName = "CMakeFiles/Makefile.cmake"; std::string cmakefileName = "CMakeFiles/Makefile.cmake";
this->Convert(cmakefileName.c_str(),HOME_OUTPUT,
cmLocalGenerator::MAKEFILE);
std::string runRule = std::string runRule =
"$(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)"; "$(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)";
runRule += " --check-build-system "; runRule += " --check-build-system ";