Commit 73644c3a authored by Brad King's avatar Brad King
Browse files

ERR: Removed a conflict that was checked in.

parent d6fae5fa
......@@ -241,16 +241,7 @@ public:
{
return m_cmHomeDirectory.c_str();
}
<<<<<<< cmMakefile.h
void SetHomeOutputDirectory(const char* lib)
{
m_HomeOutputDirectory = lib;
cmSystemTools::ConvertToUnixSlashes(m_HomeOutputDirectory);
this->AddDefinition("CMAKE_BINARY_DIR", this->GetHomeOutputDirectory());
}
=======
void SetHomeOutputDirectory(const char* lib);
>>>>>>> 1.31
const char* GetHomeOutputDirectory() const
{
return m_HomeOutputDirectory.c_str();
......
Markdown is supported
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