From 311c0b9897bd1128eae3ba1af2eaa5dd41025d91 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Sun, 9 Feb 2014 23:44:21 +0100 Subject: Eclipse: Skip generator expressions in COMPILE_DEFINITIONS (#14722) This is a hot-fix for the bug. It seems like a good idea to generally reform the generator to care about targets instead of directories, but this patch at least makes the reported error go away. --- Source/cmExtraEclipseCDT4Generator.cxx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx index 33e76cd..74ba9a6 100644 --- a/Source/cmExtraEclipseCDT4Generator.cxx +++ b/Source/cmExtraEclipseCDT4Generator.cxx @@ -841,11 +841,16 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const { // Expand the list. std::vector defs; - cmSystemTools::ExpandListArgument(cdefs, defs); + cmGeneratorExpression::Split(cdefs, defs); for(std::vector::const_iterator di = defs.begin(); di != defs.end(); ++di) { + if (cmGeneratorExpression::Find(*di) != std::string::npos) + { + continue; + } + std::string::size_type equals = di->find('=', 0); std::string::size_type enddef = di->length(); -- cgit v0.12