diff options
| author | Brad King <brad.king@kitware.com> | 2001-04-30 15:29:30 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2001-04-30 15:29:30 (GMT) |
| commit | 73644c3acd315b8e194be7fa068cdab0e94ca340 (patch) | |
| tree | 1e0c94d6a58c41c08776beba5422193392515ebd /Source/cmMakefile.h | |
| parent | d6fae5faf0ec5f0a4d4e4d12424b92c7a6fde22a (diff) | |
| download | CMake-73644c3acd315b8e194be7fa068cdab0e94ca340.zip CMake-73644c3acd315b8e194be7fa068cdab0e94ca340.tar.gz CMake-73644c3acd315b8e194be7fa068cdab0e94ca340.tar.bz2 | |
ERR: Removed a conflict that was checked in.
Diffstat (limited to 'Source/cmMakefile.h')
| -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(); |