From d95651e15abbe6dcb771b776dfc69a1412dd0400 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Thu, 6 Jun 2013 18:17:10 +0200 Subject: [PATCH] Overload cmLocalGenerator::AppendDefines to add a list. --- Source/cmLocalGenerator.cxx | 6 ++++++ Source/cmLocalGenerator.h | 3 +++ 2 files changed, 9 insertions(+) diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 00846d5f8..70d7d16f4 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -2301,7 +2301,13 @@ void cmLocalGenerator::AppendDefines(std::set& defines, // Expand the list of definitions. std::vector defines_vec; cmSystemTools::ExpandListArgument(defines_list, defines_vec); + this->AppendDefines(defines, defines_vec); +} +//---------------------------------------------------------------------------- +void cmLocalGenerator::AppendDefines(std::set& defines, + const std::vector &defines_vec) +{ for(std::vector::const_iterator di = defines_vec.begin(); di != defines_vec.end(); ++di) { diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h index f35ef8e2b..f5cd7fdd4 100644 --- a/Source/cmLocalGenerator.h +++ b/Source/cmLocalGenerator.h @@ -166,6 +166,9 @@ public: { this->AppendDefines(defines, defines_list.c_str()); } + void AppendDefines(std::set& defines, + const std::vector &defines_vec); + /** * Join a set of defines into a definesString with a space separator. */