diff options
| author | Brad King <brad.king@kitware.com> | 2017-02-17 16:11:11 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-02-17 16:11:11 (GMT) |
| commit | 4caa0e7e75cb06a99c31a23500ae8e821ca6e13f (patch) | |
| tree | a64bbb7fa38e651363368f531a43b226690afcba /Source | |
| parent | 2cffea3c72a18a19c4eb4950699c478af16fc5a7 (diff) | |
| parent | e2d78f7535951adc505014d3afde59b52caf35f1 (diff) | |
| download | CMake-4caa0e7e75cb06a99c31a23500ae8e821ca6e13f.zip CMake-4caa0e7e75cb06a99c31a23500ae8e821ca6e13f.tar.gz CMake-4caa0e7e75cb06a99c31a23500ae8e821ca6e13f.tar.bz2 | |
Merge branch 'fix-CMP0017-path-case' into release
Diffstat (limited to 'Source')
| -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 bfe46ae..1e995fb 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -3362,7 +3362,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; |