diff options
| author | Brad King <brad.king@kitware.com> | 2015-08-04 20:45:43 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-08-04 20:45:43 (GMT) |
| commit | c645590152be678a10dfae4bb9fde136a79a2c44 (patch) | |
| tree | a35a673989a9b3fe97a01c0704ebbb91a334c3f0 /Source | |
| parent | bcba0d30992eb326f9c561b2fd86c784bf358302 (diff) | |
| parent | c4d2f64f3c9dea3a5fcd8af5bb389db00ccd64df (diff) | |
| download | CMake-c645590152be678a10dfae4bb9fde136a79a2c44.zip CMake-c645590152be678a10dfae4bb9fde136a79a2c44.tar.gz CMake-c645590152be678a10dfae4bb9fde136a79a2c44.tar.bz2 | |
Merge branch 'fix-missing-subdir-error' into release
Diffstat (limited to 'Source')
| -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 ee6c1da..bdc55f2 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -1564,8 +1564,8 @@ void cmMakefile::ConfigureSubDirectory(cmLocalGenerator *lg2) 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; |