diff options
| author | Brad King <brad.king@kitware.com> | 2011-01-19 19:02:44 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2011-01-19 19:02:44 (GMT) |
| commit | cc6ba3abff983f7da6dd1301e422618065f38551 (patch) | |
| tree | 3815bafab068bac6dc93385e7427bac7a299ade9 | |
| parent | ef27b9cd899713373c6888ed55fb19420f0f5bb8 (diff) | |
| parent | 7af41c3492c5c11d6931383810e079be74309096 (diff) | |
| download | CMake-cc6ba3abff983f7da6dd1301e422618065f38551.zip CMake-cc6ba3abff983f7da6dd1301e422618065f38551.tar.gz CMake-cc6ba3abff983f7da6dd1301e422618065f38551.tar.bz2 | |
Merge topic 'missing-file-dir-issue-11677'
7af41c3 Test that missing source mentions directory (#11677)
9cefce0 Report directory with missing source file (#11677)
| -rw-r--r-- | Source/cmSourceFile.cxx | 9 | ||||
| -rw-r--r-- | Tests/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Tests/MissingSourceFile/CMakeLists.txt | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/Source/cmSourceFile.cxx b/Source/cmSourceFile.cxx index 84b728e..ed1da7b 100644 --- a/Source/cmSourceFile.cxx +++ b/Source/cmSourceFile.cxx @@ -188,8 +188,13 @@ bool cmSourceFile::FindFullPath(std::string* error) } cmOStringStream e; - e << "Cannot find source file \"" << this->Location.GetName() << "\""; - e << ". Tried extensions"; + std::string missing = this->Location.GetDirectory(); + if(!missing.empty()) + { + missing += "/"; + } + missing += this->Location.GetName(); + e << "Cannot find source file:\n " << missing << "\nTried extensions"; for(std::vector<std::string>::const_iterator ext = srcExts.begin(); ext != srcExts.end(); ++ext) { diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index c5331be..791a778 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -149,7 +149,7 @@ IF(BUILD_TESTING) ADD_TEST_MACRO(PreOrder PreOrder) ADD_TEST_MACRO(MissingSourceFile MissingSourceFile) SET_TESTS_PROPERTIES(MissingSourceFile PROPERTIES - PASS_REGULAR_EXPRESSION "CMake Error at CMakeLists.txt:3 \\(add_executable\\):[ \r\n]*Cannot find source file \"MissingSourceFile.c\"") + PASS_REGULAR_EXPRESSION "CMake Error at CMakeLists.txt:3 \\(add_executable\\):[ \r\n]*Cannot find source file:[ \r\n]*DoesNotExist/MissingSourceFile.c") ADD_TEST_MACRO(COnly COnly) ADD_TEST_MACRO(CxxOnly CxxOnly) ADD_TEST_MACRO(IPO COnly/COnly) diff --git a/Tests/MissingSourceFile/CMakeLists.txt b/Tests/MissingSourceFile/CMakeLists.txt index 42b7c51..a7206c8 100644 --- a/Tests/MissingSourceFile/CMakeLists.txt +++ b/Tests/MissingSourceFile/CMakeLists.txt @@ -1,3 +1,3 @@ cmake_minimum_required(VERSION 2.8) project(MissingSourceFile C) -add_executable(MissingSourceFile MissingSourceFile.c) +add_executable(MissingSourceFile DoesNotExist/MissingSourceFile.c) |