diff options
| author | Brad King <brad.king@kitware.com> | 2015-08-06 13:38:17 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-08-06 13:38:17 (GMT) |
| commit | d356bced9b362be1396c91854e0684da6ec6f507 (patch) | |
| tree | 67503bc7974cfbda2db06d427cc0bac11e3693dc /Source/cmMakefile.cxx | |
| parent | 42526efec45993466cbc605eb2cee70194eed4a6 (diff) | |
| parent | c4d2f64f3c9dea3a5fcd8af5bb389db00ccd64df (diff) | |
| download | CMake-d356bced9b362be1396c91854e0684da6ec6f507.zip CMake-d356bced9b362be1396c91854e0684da6ec6f507.tar.gz CMake-d356bced9b362be1396c91854e0684da6ec6f507.tar.bz2 | |
Merge topic 'fix-missing-subdir-error'
c4d2f64f add_subdirectory: Fix error message on missing CMakeLists.txt (#15680)
Diffstat (limited to 'Source/cmMakefile.cxx')
| -rw-r--r-- | Source/cmMakefile.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 4bdc9d5..29233ee 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -1796,8 +1796,8 @@ void cmMakefile::ConfigureSubDirectory(cmMakefile *mf) cmSystemTools::Message(msg.c_str()); } - currentStart += "/CMakeLists.txt"; - if(!cmSystemTools::FileExists(currentStart.c_str(), true)) + std::string const currentStartFile = currentStart + "/CMakeLists.txt"; + if (!cmSystemTools::FileExists(currentStartFile, true)) { // The file is missing. Check policy CMP0014. std::ostringstream e; |