summaryrefslogtreecommitdiffstats
path: root/Source/cmTestGenerator.cxx
diff options
context:
space:
mode:
authorBen Boeckel <mathstuf@gmail.com>2013-08-07 21:07:30 (GMT)
committerBrad King <brad.king@kitware.com>2013-09-20 12:18:22 (GMT)
commitd331292c121269ccfceee302a0f9bbb960b9f02d (patch)
treebe5575ff1ac79b79fbd63d2bef957a8c17692f2f /Source/cmTestGenerator.cxx
parent6fe5c4afc0a8363927ecd48bea4cc822894f97db (diff)
downloadCMake-d331292c121269ccfceee302a0f9bbb960b9f02d.zip
CMake-d331292c121269ccfceee302a0f9bbb960b9f02d.tar.gz
CMake-d331292c121269ccfceee302a0f9bbb960b9f02d.tar.bz2
cmTestGenerator: Evaluate generator expressions in test properties
This is useful for cases like: add_test(NAME mytest COMMAND mydriver $<TARGET_FILE:myexe>) set_tests_properties(mytest PROPERTIES REQUIRED_FILES "$<TARGET_FILE:myexe>" WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIGURATION>" ) In this example we require the actual test executable to exist to run the test in addition to the test driver at argv[0]. Also the $<CONFIGURATION> expression improves over \${CTEST_CONFIGURATION_TYPE} because the latter is not normalized for case-sensitive filesystems.
Diffstat (limited to 'Source/cmTestGenerator.cxx')
-rw-r--r--Source/cmTestGenerator.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmTestGenerator.cxx b/Source/cmTestGenerator.cxx
index 3167362..e5984a8 100644
--- a/Source/cmTestGenerator.cxx
+++ b/Source/cmTestGenerator.cxx
@@ -117,7 +117,8 @@ void cmTestGenerator::GenerateScriptForConfig(std::ostream& os,
i != pm.end(); ++i)
{
os << " " << i->first
- << " " << lg->EscapeForCMake(i->second.GetValue());
+ << " " << lg->EscapeForCMake(
+ ge.Parse(i->second.GetValue())->Evaluate(mf, config));
}
os << ")" << std::endl;
}