diff options
| author | Brad King <brad.king@kitware.com> | 2017-02-20 15:42:57 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2017-02-20 15:42:57 (GMT) |
| commit | 53a1ec631ddd59f4f4eaaf1633a784045e455342 (patch) | |
| tree | 701d61d0e97bca2f5c723eaeaaadd328f3b7668e /Source/cmMakefile.cxx | |
| parent | d36016a8ff67fe72e9a388467f3fce456225c3ec (diff) | |
| parent | e2d78f7535951adc505014d3afde59b52caf35f1 (diff) | |
| download | CMake-53a1ec631ddd59f4f4eaaf1633a784045e455342.zip CMake-53a1ec631ddd59f4f4eaaf1633a784045e455342.tar.gz CMake-53a1ec631ddd59f4f4eaaf1633a784045e455342.tar.bz2 | |
Merge topic 'fix-CMP0017-path-case'
e2d78f75 Windows: Fix inconsistent behavior on changes to case of path to cmake
Diffstat (limited to 'Source/cmMakefile.cxx')
| -rw-r--r-- | Source/cmMakefile.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index bdaca97..b3d7a04 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -3354,7 +3354,7 @@ std::string cmMakefile::GetModulesFile(const char* filename) const if (!moduleInCMakeModulePath.empty() && !moduleInCMakeRoot.empty()) { const char* currentFile = this->GetDefinition("CMAKE_CURRENT_LIST_FILE"); std::string mods = cmSystemTools::GetCMakeRoot() + "/Modules/"; - if (currentFile && strncmp(currentFile, mods.c_str(), mods.size()) == 0) { + if (currentFile && cmSystemTools::IsSubDirectory(currentFile, mods)) { switch (this->GetPolicyStatus(cmPolicies::CMP0017)) { case cmPolicies::WARN: { std::ostringstream e; |