From 42ea896d22cb2f04b08546918521fe7972a6174b Mon Sep 17 00:00:00 2001 From: Andy Cedilnik Date: Tue, 20 Jul 2004 11:07:37 -0400 Subject: [PATCH] ENH: When running cmake with PreLoad make sure CMAKE_CURRENT_SOURCE/BINARY_DIR works --- Source/cmMakefile.cxx | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 46204b0f1..265c0b0e5 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -1735,6 +1735,10 @@ void cmMakefile::SetHomeDirectory(const char* dir) m_cmHomeDirectory = dir; cmSystemTools::ConvertToUnixSlashes(m_cmHomeDirectory); 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) @@ -1742,6 +1746,10 @@ void cmMakefile::SetHomeOutputDirectory(const char* lib) m_HomeOutputDirectory = lib; cmSystemTools::ConvertToUnixSlashes(m_HomeOutputDirectory); this->AddDefinition("CMAKE_BINARY_DIR", this->GetHomeOutputDirectory()); + if ( !this->GetDefinition("CMAKE_CURRENT_BINARY_DIR") ) + { + this->AddDefinition("CMAKE_CURRENT_BINARY_DIR", this->GetHomeOutputDirectory()); + } }