diff options
| author | Brad King <brad.king@kitware.com> | 2001-03-15 19:33:47 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2001-03-15 19:33:47 (GMT) |
| commit | f84972610ece8f7a82e8505625021ffbab5514e5 (patch) | |
| tree | bd4cc2e8716ef4eed5af0097a18957156662dcef | |
| parent | 354992c522048c8e1bfd3b786841e7be4ca2ef9f (diff) | |
| download | CMake-f84972610ece8f7a82e8505625021ffbab5514e5.zip CMake-f84972610ece8f7a82e8505625021ffbab5514e5.tar.gz CMake-f84972610ece8f7a82e8505625021ffbab5514e5.tar.bz2 | |
BUG: Moved definition of CMAKE_SOURCE_DIR and CMAKE_BINARY_DIR to be as soon as their information is known.
| -rw-r--r-- | Source/cmMakefile.cxx | 6 | ||||
| -rw-r--r-- | Source/cmMakefile.h | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index f38cda2..815421f 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -388,11 +388,7 @@ std::string cmMakefile::GetParentListFileName(const char *currentFileName) void cmMakefile::ExpandVariables() { - // make sure binary and source dir are defined - this->AddDefinition("CMAKE_BINARY_DIR", this->GetHomeOutputDirectory()); - this->AddDefinition("CMAKE_SOURCE_DIR", this->GetHomeDirectory()); - - // Now expand varibles in the include and link strings + // Now expand varibles in the include and link strings std::vector<std::string>::iterator j, begin, end; begin = m_IncludeDirectories.begin(); end = m_IncludeDirectories.end(); diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h index 62961e8..293d2bf 100644 --- a/Source/cmMakefile.h +++ b/Source/cmMakefile.h @@ -173,6 +173,7 @@ public: { m_cmHomeDirectory = dir; cmSystemTools::ConvertToUnixSlashes(m_cmHomeDirectory); + this->AddDefinition("CMAKE_SOURCE_DIR", this->GetHomeDirectory()); } const char* GetHomeDirectory() { @@ -182,6 +183,7 @@ public: { m_HomeOutputDirectory = lib; cmSystemTools::ConvertToUnixSlashes(m_HomeOutputDirectory); + this->AddDefinition("CMAKE_BINARY_DIR", this->GetHomeOutputDirectory()); } const char* GetHomeOutputDirectory() { |