diff options
| author | Ken Martin <ken.martin@kitware.com> | 2005-12-13 20:14:08 (GMT) |
|---|---|---|
| committer | Ken Martin <ken.martin@kitware.com> | 2005-12-13 20:14:08 (GMT) |
| commit | c3c349109b5f8c08766295881c1749c045f170c2 (patch) | |
| tree | d96804d3bc0ad6150643dfa68aed0280cff241b6 | |
| parent | 0b69b892edd2c833fde53891f30d376ff1d16734 (diff) | |
| download | CMake-c3c349109b5f8c08766295881c1749c045f170c2.zip CMake-c3c349109b5f8c08766295881c1749c045f170c2.tar.gz CMake-c3c349109b5f8c08766295881c1749c045f170c2.tar.bz2 | |
ENH: removed TARGET_DIR_PREFIX support and someother fix
| -rw-r--r-- | Source/cmLocalUnixMakefileGenerator3.cxx | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx index d00e6a1..2e0af55 100644 --- a/Source/cmLocalUnixMakefileGenerator3.cxx +++ b/Source/cmLocalUnixMakefileGenerator3.cxx @@ -1980,16 +1980,7 @@ cmLocalUnixMakefileGenerator3 std::string cmLocalUnixMakefileGenerator3::GetTargetDirectory(cmTarget& target) { - std::string dir; - // 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/"; - } + std::string dir = "CMakeFiles/"; dir += target.GetName(); dir += ".dir"; return dir; @@ -2881,6 +2872,8 @@ void cmLocalUnixMakefileGenerator3 depends.clear(); commands.clear(); std::string cmakefileName = "CMakeFiles/Makefile.cmake"; + this->Convert(cmakefileName.c_str(),HOME_OUTPUT, + cmLocalGenerator::MAKEFILE); std::string runRule = "$(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)"; runRule += " --check-build-system "; |