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

ERR: Removed a conflict that was checked in.

Browse Source
This commit is contained in:
Brad King 2001-04-30 11:29:30 -04:00
parent d6fae5faf0
commit 73644c3acd
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/cmMakefile.h
View File

@ -241,16 +241,7 @@ public:
{ {
return m_cmHomeDirectory.c_str(); 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); void SetHomeOutputDirectory(const char* lib);
>>>>>>> 1.31
const char* GetHomeOutputDirectory() const const char* GetHomeOutputDirectory() const
{ {
return m_HomeOutputDirectory.c_str(); return m_HomeOutputDirectory.c_str();