diff options
| author | Brad King <brad.king@kitware.com> | 2018-04-25 12:57:01 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-04-25 12:57:08 (GMT) |
| commit | 22e483744290a27c17cca42e22ed47ef1b37007d (patch) | |
| tree | b8c2da8165f7384d5f0f6fce53f0fab287fe81ba /Source/cmMakefile.cxx | |
| parent | 5a6c6292898fe238f3a5105133b8904209fbedaf (diff) | |
| parent | 60cb75e4a196c97e55d535486e2d28630afb3f6e (diff) | |
| download | CMake-22e483744290a27c17cca42e22ed47ef1b37007d.zip CMake-22e483744290a27c17cca42e22ed47ef1b37007d.tar.gz CMake-22e483744290a27c17cca42e22ed47ef1b37007d.tar.bz2 | |
Merge topic 'fix-CMAKE_DISABLE_SOURCE_CHANGES-top-dir'
60cb75e4a1 Fix CMAKE_DISABLE_SOURCE_CHANGES recognition of top of build tree
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2001
Diffstat (limited to 'Source/cmMakefile.cxx')
| -rw-r--r-- | Source/cmMakefile.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 18ba7aa..b6bf08b 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -2333,7 +2333,8 @@ bool cmMakefile::CanIWriteThisFile(std::string const& fileName) const } return !cmSystemTools::IsSubDirectory(fileName, this->GetHomeDirectory()) || - cmSystemTools::IsSubDirectory(fileName, this->GetHomeOutputDirectory()); + cmSystemTools::IsSubDirectory(fileName, this->GetHomeOutputDirectory()) || + cmSystemTools::SameFile(fileName, this->GetHomeOutputDirectory()); } const char* cmMakefile::GetRequiredDefinition(const std::string& name) const |