summaryrefslogtreecommitdiffstats
path: root/Source/cmLocalGenerator.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-07-13 11:46:16 (GMT)
committerKitware Robot <kwrobot@kitware.com>2017-07-13 11:46:47 (GMT)
commit0f158272d6ad0f681495482530b37d307676a157 (patch)
treea84fe0133cf3a5f508bd07cb8a5a5f455ecc859e /Source/cmLocalGenerator.cxx
parentf5be951117711a3965db0f9cd59a2913efacece7 (diff)
parent117033c1d97456833e49336f6f3ebda5de3a5cbd (diff)
downloadCMake-0f158272d6ad0f681495482530b37d307676a157.zip
CMake-0f158272d6ad0f681495482530b37d307676a157.tar.gz
CMake-0f158272d6ad0f681495482530b37d307676a157.tar.bz2
Merge topic 'test_include_files'
117033c1 Add TEST_INCLUDE_DIR[S] unit test ed5bde30 Add TEST_INCLUDE_FILES Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1031
Diffstat (limited to 'Source/cmLocalGenerator.cxx')
-rw-r--r--Source/cmLocalGenerator.cxx11
1 files changed, 11 insertions, 0 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 6603428..85ef042 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -259,6 +259,17 @@ void cmLocalGenerator::GenerateTestFiles()
fout << "include(\"" << testIncludeFile << "\")" << std::endl;
}
+ const char* testIncludeFiles =
+ this->Makefile->GetProperty("TEST_INCLUDE_FILES");
+ if (testIncludeFiles) {
+ std::vector<std::string> includesList;
+ cmSystemTools::ExpandListArgument(testIncludeFiles, includesList);
+ for (std::vector<std::string>::const_iterator i = includesList.begin();
+ i != includesList.end(); ++i) {
+ fout << "include(\"" << *i << "\")" << std::endl;
+ }
+ }
+
// Ask each test generator to write its code.
std::vector<cmTestGenerator*> const& testers =
this->Makefile->GetTestGenerators();