Merge topic 'fix-CMP0017-path-case'

e2d78f75 Windows: Fix inconsistent behavior on changes to case of path to cmake
This commit is contained in:
Brad King
2017-02-20 10:42:57 -05:00
committed by CMake Topic Stage
+1 -1
View File
@@ -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;