From 7b006cb1156e08e89c830c4480401d88258ce02e Mon Sep 17 00:00:00 2001 From: Mikko Rasa Date: Sat, 31 Oct 2015 17:25:45 +0200 Subject: [PATCH] Pass language standards throuhg ALL dependencies Not just direct ones. I really don't know why I put it in the !=CHAINED block. --- source/buildinfo.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/buildinfo.cpp b/source/buildinfo.cpp index 8143235..0c32ec5 100644 --- a/source/buildinfo.cpp +++ b/source/buildinfo.cpp @@ -49,12 +49,12 @@ void BuildInfo::update_from(const BuildInfo &bi, UpdateLevel level) for(DefineMap::const_iterator i=bi.defines.begin(); i!=bi.defines.end(); ++i) defines[i->first] = i->second; incpath.insert(incpath.begin(), bi.incpath.begin(), bi.incpath.end()); + for(StandardMap::const_iterator i=bi.standards.begin(); i!=bi.standards.end(); ++i) + standards[i->first] = i->second; if(level!=CHAINED) { libpath.insert(libpath.begin(), bi.libpath.begin(), bi.libpath.end()); libs.insert(libs.begin(), bi.libs.begin(), bi.libs.end()); - for(StandardMap::const_iterator i=bi.standards.begin(); i!=bi.standards.end(); ++i) - standards[i->first] = i->second; } threads = bi.threads; if(level==LOCAL) -- 2.43.0