Commit 221f8aa7 authored by Brad King's avatar Brad King

Merge branch 'file-GLOB-remove-new-errors' into release-3.12

Merge-request: !2164
parents 5dc9f440 142a6257
...@@ -777,7 +777,7 @@ bool cmFileCommand::HandleGlobCommand(std::vector<std::string> const& args, ...@@ -777,7 +777,7 @@ bool cmFileCommand::HandleGlobCommand(std::vector<std::string> const& args,
this->Makefile->GetCMakeInstance()->GetWorkingMode(); this->Makefile->GetCMakeInstance()->GetWorkingMode();
while (i != args.end()) { while (i != args.end()) {
if (*i == "LIST_DIRECTORIES") { if (*i == "LIST_DIRECTORIES") {
++i; ++i; // skip LIST_DIRECTORIES
if (i != args.end()) { if (i != args.end()) {
if (cmSystemTools::IsOn(i->c_str())) { if (cmSystemTools::IsOn(i->c_str())) {
g.SetListDirs(true); g.SetListDirs(true);
...@@ -789,27 +789,21 @@ bool cmFileCommand::HandleGlobCommand(std::vector<std::string> const& args, ...@@ -789,27 +789,21 @@ bool cmFileCommand::HandleGlobCommand(std::vector<std::string> const& args,
this->SetError("LIST_DIRECTORIES missing bool value."); this->SetError("LIST_DIRECTORIES missing bool value.");
return false; return false;
} }
++i;
} else { } else {
this->SetError("LIST_DIRECTORIES missing bool value."); this->SetError("LIST_DIRECTORIES missing bool value.");
return false; return false;
} }
++i;
if (i == args.end()) {
this->SetError("GLOB requires a glob expression after the bool.");
return false;
}
} else if (*i == "FOLLOW_SYMLINKS") { } else if (*i == "FOLLOW_SYMLINKS") {
if (!recurse) { ++i; // skip FOLLOW_SYMLINKS
this->SetError("FOLLOW_SYMLINKS is not a valid parameter for GLOB."); if (recurse) {
return false; explicitFollowSymlinks = true;
} g.RecurseThroughSymlinksOn();
explicitFollowSymlinks = true; if (i == args.end()) {
g.RecurseThroughSymlinksOn(); this->SetError(
++i; "GLOB_RECURSE requires a glob expression after FOLLOW_SYMLINKS.");
if (i == args.end()) { return false;
this->SetError( }
"GLOB_RECURSE requires a glob expression after FOLLOW_SYMLINKS.");
return false;
} }
} else if (*i == "RELATIVE") { } else if (*i == "RELATIVE") {
++i; // skip RELATIVE ++i; // skip RELATIVE
......
^CMake Error at GLOB-error-FOLLOW_SYMLINKS\.cmake:[0-9]+ \(file\):
file FOLLOW_SYMLINKS is not a valid parameter for GLOB\.
Call Stack \(most recent call first\):
CMakeLists\.txt:[0-9]+ \(include\)$
^CMake Error at GLOB-noexp-LIST_DIRECTORIES\.cmake:[0-9]+ \(file\):
file GLOB requires a glob expression after the bool\.
Call Stack \(most recent call first\):
CMakeLists\.txt:[0-9]+ \(include\)$
...@@ -39,12 +39,12 @@ run_cmake(GLOB_RECURSE-noexp-FOLLOW_SYMLINKS) ...@@ -39,12 +39,12 @@ run_cmake(GLOB_RECURSE-noexp-FOLLOW_SYMLINKS)
# tests are valid both for GLOB and GLOB_RECURSE # tests are valid both for GLOB and GLOB_RECURSE
run_cmake(GLOB-sort-dedup) run_cmake(GLOB-sort-dedup)
run_cmake(GLOB-error-FOLLOW_SYMLINKS)
run_cmake(GLOB-error-LIST_DIRECTORIES-not-boolean) run_cmake(GLOB-error-LIST_DIRECTORIES-not-boolean)
run_cmake(GLOB-error-LIST_DIRECTORIES-no-arg) run_cmake(GLOB-error-LIST_DIRECTORIES-no-arg)
run_cmake(GLOB-error-RELATIVE-no-arg) run_cmake(GLOB-error-RELATIVE-no-arg)
run_cmake(GLOB-error-CONFIGURE_DEPENDS-modified) run_cmake(GLOB-error-CONFIGURE_DEPENDS-modified)
run_cmake(GLOB-noexp-CONFIGURE_DEPENDS) run_cmake(GLOB-noexp-CONFIGURE_DEPENDS)
run_cmake(GLOB-noexp-FOLLOW_SYMLINKS)
run_cmake(GLOB-noexp-LIST_DIRECTORIES) run_cmake(GLOB-noexp-LIST_DIRECTORIES)
run_cmake(GLOB-noexp-RELATIVE) run_cmake(GLOB-noexp-RELATIVE)
run_cmake_command(GLOB-error-CONFIGURE_DEPENDS-SCRIPT_MODE ${CMAKE_COMMAND} -P run_cmake_command(GLOB-error-CONFIGURE_DEPENDS-SCRIPT_MODE ${CMAKE_COMMAND} -P
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment