ENH: When running cmake with PreLoad make sure CMAKE_CURRENT_SOURCE/BINARY_DIR works
This commit is contained in:
parent
2474302c25
commit
42ea896d22
@ -1735,6 +1735,10 @@ void cmMakefile::SetHomeDirectory(const char* dir)
|
|||||||
m_cmHomeDirectory = dir;
|
m_cmHomeDirectory = dir;
|
||||||
cmSystemTools::ConvertToUnixSlashes(m_cmHomeDirectory);
|
cmSystemTools::ConvertToUnixSlashes(m_cmHomeDirectory);
|
||||||
this->AddDefinition("CMAKE_SOURCE_DIR", this->GetHomeDirectory());
|
this->AddDefinition("CMAKE_SOURCE_DIR", this->GetHomeDirectory());
|
||||||
|
if ( !this->GetDefinition("CMAKE_CURRENT_SOURCE_DIR") )
|
||||||
|
{
|
||||||
|
this->AddDefinition("CMAKE_CURRENT_SOURCE_DIR", this->GetHomeDirectory());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void cmMakefile::SetHomeOutputDirectory(const char* lib)
|
void cmMakefile::SetHomeOutputDirectory(const char* lib)
|
||||||
@ -1742,6 +1746,10 @@ void cmMakefile::SetHomeOutputDirectory(const char* lib)
|
|||||||
m_HomeOutputDirectory = lib;
|
m_HomeOutputDirectory = lib;
|
||||||
cmSystemTools::ConvertToUnixSlashes(m_HomeOutputDirectory);
|
cmSystemTools::ConvertToUnixSlashes(m_HomeOutputDirectory);
|
||||||
this->AddDefinition("CMAKE_BINARY_DIR", this->GetHomeOutputDirectory());
|
this->AddDefinition("CMAKE_BINARY_DIR", this->GetHomeOutputDirectory());
|
||||||
|
if ( !this->GetDefinition("CMAKE_CURRENT_BINARY_DIR") )
|
||||||
|
{
|
||||||
|
this->AddDefinition("CMAKE_CURRENT_BINARY_DIR", this->GetHomeOutputDirectory());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user