diff options
| author | Brad King <brad.king@kitware.com> | 2018-04-24 14:44:49 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-04-24 14:44:49 (GMT) |
| commit | 0b992b97517136ba21b93860ff4686b75bc962aa (patch) | |
| tree | ba2aad43c8725c2b9a63de1c8e9fe9223b140aa5 | |
| parent | c86386caa3b4ace68573b1eeea45da40f304db3f (diff) | |
| parent | 60cb75e4a196c97e55d535486e2d28630afb3f6e (diff) | |
| download | CMake-0b992b97517136ba21b93860ff4686b75bc962aa.zip CMake-0b992b97517136ba21b93860ff4686b75bc962aa.tar.gz CMake-0b992b97517136ba21b93860ff4686b75bc962aa.tar.bz2 | |
Merge branch 'fix-CMAKE_DISABLE_SOURCE_CHANGES-top-dir' into release-3.11
Merge-request: !2001
| -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 71359a2..604ca2c 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -2304,7 +2304,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 |