From ca77b745e9b58fb64a51e64375fe961913ced524 Mon Sep 17 00:00:00 2001 From: scivision Date: Sun, 17 Sep 2023 22:32:27 -0400 Subject: cmake: Clarify error if -P script does not exist --- Source/cmake.cxx | 3 +++ Tests/RunCMake/CommandLine/C-no-file-stderr.txt | 2 +- Tests/RunCMake/CommandLine/Cno-file-stderr.txt | 2 +- Tests/RunCMake/CommandLine/P_directory-stderr.txt | 2 +- Tests/RunCMake/CommandLine/P_no-file-stderr.txt | 3 ++- Tests/RunCMake/CommandLine/install-bad-dir-stderr.txt | 2 +- 6 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Source/cmake.cxx b/Source/cmake.cxx index 1d8a847..f7b7ada 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -785,6 +785,9 @@ void cmake::ReadListFile(const std::vector& args, mf.SetArgcArgv(args); } + if (!cmSystemTools::FileExists(path, true)) { + cmSystemTools::Error("Not a file: " + path); + } if (!mf.ReadListFile(path)) { cmSystemTools::Error("Error processing file: " + path); } diff --git a/Tests/RunCMake/CommandLine/C-no-file-stderr.txt b/Tests/RunCMake/CommandLine/C-no-file-stderr.txt index b65a349..5d3d4b3 100644 --- a/Tests/RunCMake/CommandLine/C-no-file-stderr.txt +++ b/Tests/RunCMake/CommandLine/C-no-file-stderr.txt @@ -1,3 +1,3 @@ -^CMake Error: Error processing file: .*/Tests/RunCMake/CommandLine/C-no-file-build/nosuchcachefile.txt +^CMake Error: Not a file: .*/Tests/RunCMake/CommandLine/C-no-file-build/nosuchcachefile.txt CMake Error: The source directory ".*/Tests/RunCMake/CommandLine/C-no-file-build" does not appear to contain CMakeLists.txt. Specify --help for usage, or press the help button on the CMake GUI.$ diff --git a/Tests/RunCMake/CommandLine/Cno-file-stderr.txt b/Tests/RunCMake/CommandLine/Cno-file-stderr.txt index 416686c..4024499 100644 --- a/Tests/RunCMake/CommandLine/Cno-file-stderr.txt +++ b/Tests/RunCMake/CommandLine/Cno-file-stderr.txt @@ -1,3 +1,3 @@ -^CMake Error: Error processing file: .*/Tests/RunCMake/CommandLine/Cno-file-build/nosuchcachefile.txt +^CMake Error: Not a file: .*/Tests/RunCMake/CommandLine/Cno-file-build/nosuchcachefile.txt CMake Error: The source directory ".*/Tests/RunCMake/CommandLine/Cno-file-build" does not appear to contain CMakeLists.txt. Specify --help for usage, or press the help button on the CMake GUI.$ diff --git a/Tests/RunCMake/CommandLine/P_directory-stderr.txt b/Tests/RunCMake/CommandLine/P_directory-stderr.txt index b8319a1..ec33aed 100644 --- a/Tests/RunCMake/CommandLine/P_directory-stderr.txt +++ b/Tests/RunCMake/CommandLine/P_directory-stderr.txt @@ -1 +1 @@ -^CMake Error: Error processing file: .*/Tests/RunCMake/CommandLine$ +^CMake Error: Not a file: .*/Tests/RunCMake/CommandLine$ diff --git a/Tests/RunCMake/CommandLine/P_no-file-stderr.txt b/Tests/RunCMake/CommandLine/P_no-file-stderr.txt index 2e12399..a3b4e8e 100644 --- a/Tests/RunCMake/CommandLine/P_no-file-stderr.txt +++ b/Tests/RunCMake/CommandLine/P_no-file-stderr.txt @@ -1 +1,2 @@ -^CMake Error: Error processing file: nosuchscriptfile.cmake$ +^CMake Error: Not a file: nosuchscriptfile.cmake +CMake Error: Error processing file: nosuchscriptfile.cmake$ diff --git a/Tests/RunCMake/CommandLine/install-bad-dir-stderr.txt b/Tests/RunCMake/CommandLine/install-bad-dir-stderr.txt index 320aecc..87999d5 100644 --- a/Tests/RunCMake/CommandLine/install-bad-dir-stderr.txt +++ b/Tests/RunCMake/CommandLine/install-bad-dir-stderr.txt @@ -1 +1 @@ -^CMake Error: Error processing file: +^CMake Error: Not a file: -- cgit v0.12