diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-04-18 12:50:32 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-04-18 13:29:17 (GMT) |
| commit | a2f2aeee2f4d4af1f25f4a5b86bacb8a81a7dec4 (patch) | |
| tree | dd46c44fb1a2267149352ff1a95b09b72ce737f8 /Source/CTest | |
| parent | 68f791cd06983e8fd375edfba74a9d821231e269 (diff) | |
| download | CMake-a2f2aeee2f4d4af1f25f4a5b86bacb8a81a7dec4.zip CMake-a2f2aeee2f4d4af1f25f4a5b86bacb8a81a7dec4.tar.gz CMake-a2f2aeee2f4d4af1f25f4a5b86bacb8a81a7dec4.tar.bz2 | |
cmMakefile: Add wrapper for reading listfiles which have an origin.
Such files are delegates from other files, and so they set the
CMAKE_PARENT_LIST_FILE to the originator. They also may set a
policy scope.
Diffstat (limited to 'Source/CTest')
| -rw-r--r-- | Source/CTest/cmCTestTestHandler.cxx | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx index c50ea88..59c5e92 100644 --- a/Source/CTest/cmCTestTestHandler.cxx +++ b/Source/CTest/cmCTestTestHandler.cxx @@ -117,9 +117,7 @@ bool cmCTestSubdirCommand } fname += "/"; fname += testFilename; - bool readit = - this->Makefile->ReadListFile(this->Makefile->GetCurrentListFile(), - fname.c_str()); + bool readit = this->Makefile->ReadDependentFile(fname.c_str()); cmSystemTools::ChangeDirectory(cwd); if(!readit) { @@ -205,9 +203,7 @@ bool cmCTestAddSubdirectoryCommand } fname += "/"; fname += testFilename; - bool readit = - this->Makefile->ReadListFile(this->Makefile->GetCurrentListFile(), - fname.c_str()); + bool readit = this->Makefile->ReadDependentFile(fname.c_str()); cmSystemTools::ChangeDirectory(cwd); if(!readit) { |