diff options
| author | Brad King <brad.king@kitware.com> | 2014-02-11 14:16:04 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-02-11 14:16:04 (GMT) |
| commit | e44bbec0134200c2f2f320d4364117888ab99248 (patch) | |
| tree | 13fbd92f2df9c6fd611edd33ad6d0cf53d204ec7 | |
| parent | a12dd791dd32944f52ef5e1078a2e3a8eec2a8a1 (diff) | |
| parent | 311c0b9897bd1128eae3ba1af2eaa5dd41025d91 (diff) | |
| download | CMake-e44bbec0134200c2f2f320d4364117888ab99248.zip CMake-e44bbec0134200c2f2f320d4364117888ab99248.tar.gz CMake-e44bbec0134200c2f2f320d4364117888ab99248.tar.bz2 | |
Merge topic 'eclipse-hotfix'
311c0b98 Eclipse: Skip generator expressions in COMPILE_DEFINITIONS (#14722)
| -rw-r--r-- | Source/cmExtraEclipseCDT4Generator.cxx | 7 |
1 files changed, 6 insertions, 1 deletions
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<std::string> defs; - cmSystemTools::ExpandListArgument(cdefs, defs); + cmGeneratorExpression::Split(cdefs, defs); for(std::vector<std::string>::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(); |