From c069a57301a468dbc45f3f3775b623e5532f9398 Mon Sep 17 00:00:00 2001 From: Brian Osman Date: Tue, 19 Jun 2018 16:05:09 -0400 Subject: added NIMA sample to showcase animations improved third_party template to include headers as system headers for non-Windows machines Bug: skia: Change-Id: Id2fa74fc31b49f9b07cc83e7f60477c7ab4f8d83 Reviewed-on: https://skia-review.googlesource.com/135450 Commit-Queue: Brian Osman Reviewed-by: Mike Klein Reviewed-by: Brian Osman --- third_party/third_party.gni | 37 +++++++++++++++++++++++++++---------- 1 file changed, 27 insertions(+), 10 deletions(-) (limited to 'third_party/third_party.gni') diff --git a/third_party/third_party.gni b/third_party/third_party.gni index 7aaf63586f..384eeed580 100644 --- a/third_party/third_party.gni +++ b/third_party/third_party.gni @@ -4,21 +4,38 @@ # found in the LICENSE file. template("third_party") { + enabled = !defined(invoker.enabled) || invoker.enabled config(target_name + "_public") { - if (defined(invoker.public_defines)) { - defines = invoker.public_defines + if (enabled) { + cflags = [] + if (defined(invoker.public_defines)) { + defines = invoker.public_defines + } + if (is_win) { + include_dirs = invoker.public_include_dirs + } else { + foreach(dir, invoker.public_include_dirs) { + cflags += [ + "-isystem", + rebase_path(dir), + ] + } + } + } else { + not_needed(invoker, "*") } - include_dirs = invoker.public_include_dirs } source_set(target_name) { - forward_variables_from(invoker, "*", [ "public_include_dirs" ]) - public_configs = [ ":" + target_name + "_public" ] + if (enabled) { + forward_variables_from(invoker, "*", [ "public_include_dirs" ]) + public_configs = [ ":" + target_name + "_public" ] - # Warnings are just noise if we're not maintaining the code. - if (is_win) { - cflags = [ "/w" ] - } else { - cflags = [ "-w" ] + # Warnings are just noise if we're not maintaining the code. + if (is_win) { + cflags = [ "/w" ] + } else { + cflags = [ "-w" ] + } } } } -- cgit v1.2.3