From 889390a1abae1e257fdcd16a47c34b09421c4066 Mon Sep 17 00:00:00 2001 From: "phajdan.jr@chromium.org" Date: Thu, 3 Jan 2013 18:02:36 +0000 Subject: Linux: add an option to use system jsoncpp BUG=none Review URL: https://codereview.chromium.org/11737009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174979 0039d316-1c4b-4281-b951-d872f2087c98 --- third_party/jsoncpp/jsoncpp.gyp | 102 +++++++++++++++++++++++++++------------- 1 file changed, 69 insertions(+), 33 deletions(-) (limited to 'third_party') diff --git a/third_party/jsoncpp/jsoncpp.gyp b/third_party/jsoncpp/jsoncpp.gyp index 1395f94..e4a9877 100644 --- a/third_party/jsoncpp/jsoncpp.gyp +++ b/third_party/jsoncpp/jsoncpp.gyp @@ -3,41 +3,77 @@ # found in the LICENSE file. { - 'targets': [ - { - 'target_name': 'jsoncpp', - 'type': 'static_library', - 'defines': [ - 'JSON_USE_EXCEPTION=0', + 'variables': { + 'use_system_jsoncpp%': 0, + }, + 'conditions': [ + ['use_system_jsoncpp==0', { + 'targets': [ + { + 'target_name': 'jsoncpp', + 'type': 'static_library', + 'defines': [ + 'JSON_USE_EXCEPTION=0', + ], + 'sources': [ + 'source/include/json/assertions.h', + 'source/include/json/autolink.h', + 'source/include/json/config.h', + 'source/include/json/features.h', + 'source/include/json/forwards.h', + 'source/include/json/json.h', + 'source/include/json/reader.h', + 'overrides/include/json/value.h', + 'source/include/json/writer.h', + 'source/src/lib_json/json_batchallocator.h', + 'source/src/lib_json/json_reader.cpp', + 'source/src/lib_json/json_tool.h', + 'overrides/src/lib_json/json_value.cpp', + 'source/src/lib_json/json_writer.cpp', + ], + 'include_dirs': [ + 'overrides/include/', + 'source/include/', + 'source/src/lib_json/', + ], + 'direct_dependent_settings': { + 'include_dirs': [ + 'overrides/include/', + 'source/include/', + ], + }, + }, ], - 'sources': [ - 'source/include/json/assertions.h', - 'source/include/json/autolink.h', - 'source/include/json/config.h', - 'source/include/json/features.h', - 'source/include/json/forwards.h', - 'source/include/json/json.h', - 'source/include/json/reader.h', - 'overrides/include/json/value.h', - 'source/include/json/writer.h', - 'source/src/lib_json/json_batchallocator.h', - 'source/src/lib_json/json_reader.cpp', - 'source/src/lib_json/json_tool.h', - 'overrides/src/lib_json/json_value.cpp', - 'source/src/lib_json/json_writer.cpp', + }, { # use_system_jsoncpp==1 + 'targets': [ + { + 'target_name': 'jsoncpp', + 'type': 'none', + 'variables': { + 'headers_root_path': 'source/include', + 'header_filenames': [ + 'json/assertions.h', + 'json/autolink.h', + 'json/config.h', + 'json/features.h', + 'json/forwards.h', + 'json/json.h', + 'json/reader.h', + 'json/value.h', + 'json/writer.h', + ], + }, + 'includes': [ + '../../build/shim_headers.gypi', + ], + 'link_settings': { + 'libraries': [ + '-ljsoncpp', + ], + }, + } ], - 'include_dirs': [ - 'overrides/include/', - 'source/include/', - 'source/src/lib_json/', - ], - 'direct_dependent_settings': { - 'include_dirs': [ - 'overrides/include/', - 'source/include/', - ], - }, - }, + }], ], } -- cgit v1.1