diff options
| -rw-r--r-- | Source/cmMakefile.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h index e4a7149..7456544 100644 --- a/Source/cmMakefile.h +++ b/Source/cmMakefile.h @@ -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(); |