Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(140)

Side by Side Diff: tools/gn/config_values.cc

Issue 1342183003: Allow GN configs to have sub-configs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « tools/gn/config_values.h ('k') | tools/gn/config_values_extractors.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "tools/gn/config_values.h" 5 #include "tools/gn/config_values.h"
6 6
7 namespace {
8
9 template<typename T>
10 void VectorAppend(std::vector<T>* append_to,
11 const std::vector<T>& append_this) {
12 if (append_this.empty())
13 return;
14 append_to->insert(append_to->end(),append_this.begin(), append_this.end());
15 }
16
17 } // namespace
18
7 ConfigValues::ConfigValues() { 19 ConfigValues::ConfigValues() {
8 } 20 }
9 21
10 ConfigValues::~ConfigValues() { 22 ConfigValues::~ConfigValues() {
11 } 23 }
24
25 void ConfigValues::AppendValues(const ConfigValues& append) {
26 VectorAppend(&cflags_, append.cflags_);
27 VectorAppend(&cflags_c_, append.cflags_c_);
28 VectorAppend(&cflags_cc_, append.cflags_cc_);
29 VectorAppend(&cflags_objc_, append.cflags_objc_);
30 VectorAppend(&cflags_objcc_, append.cflags_objcc_);
31 VectorAppend(&defines_, append.defines_);
32 VectorAppend(&include_dirs_, append.include_dirs_);
33 VectorAppend(&ldflags_, append.ldflags_);
34 VectorAppend(&lib_dirs_, append.lib_dirs_);
35 VectorAppend(&libs_, append.libs_);
36
37 // Only append precompiled header if there isn't one. It might be nice to
38 // throw an error if there are conflicting precompiled headers, but that
39 // requires piping through some context of the actual configs involved, and
40 // conflicts here should be very unusual. Instead, use the first value.
41 if (!append.precompiled_header_.empty() && !precompiled_header_.empty())
42 precompiled_header_ = append.precompiled_header_;
43 if (!append.precompiled_source_.is_null() && !precompiled_source_.is_null())
44 precompiled_source_ = append.precompiled_source_;
45 }
OLDNEW
« no previous file with comments | « tools/gn/config_values.h ('k') | tools/gn/config_values_extractors.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698