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

Unified Diff: third_party/jsoncpp/jsoncpp.gyp

Issue 11737009: Linux: add an option to use system jsoncpp (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 12 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/jsoncpp/jsoncpp.gyp
diff --git a/third_party/jsoncpp/jsoncpp.gyp b/third_party/jsoncpp/jsoncpp.gyp
index 1395f94bbf093bda189114b31e44869460210116..e4a9877e0922cfad81badb2e6aacc2f9a07b839e 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/',
- ],
- },
- },
+ }],
],
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698