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

Side by Side Diff: third_party/sqlite/sqlite.gyp

Issue 10696219: GYP changes to get sql and sqlite building on iOS. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 5 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
« build/common.gypi ('K') | « sql/sql.gyp ('k') | no next file » | 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) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 { 5 {
6 'variables': { 6 'variables': {
7 'use_system_sqlite%': 0, 7 'use_system_sqlite%': 0,
8 'required_sqlite_version': '3.6.1', 8 'required_sqlite_version': '3.6.1',
9 }, 9 },
10 'target_defaults': { 10 'target_defaults': {
(...skipping 25 matching lines...) Expand all
36 ], 36 ],
37 ['OS=="linux" and not use_system_sqlite', { 37 ['OS=="linux" and not use_system_sqlite', {
38 'link_settings': { 38 'link_settings': {
39 'libraries': [ 39 'libraries': [
40 '-ldl', 40 '-ldl',
41 ], 41 ],
42 }, 42 },
43 }], 43 }],
44 ['os_posix == 1 and OS != "mac" and use_system_sqlite', { 44 ['os_posix == 1 and OS != "mac" and use_system_sqlite', {
45 'type': 'none', 45 'type': 'none',
46
46 'direct_dependent_settings': { 47 'direct_dependent_settings': {
47 'cflags': [
48 # This next command produces no output but it it will fail (and
49 # cause GYP to fail) if we don't have a recent enough version of
50 # sqlite.
51 '<!@(pkg-config --atleast-version=<(required_sqlite_version) sqlit e3)',
52
53 '<!@(pkg-config --cflags sqlite3)',
54 ],
55 'defines': [ 48 'defines': [
56 'USE_SYSTEM_SQLITE', 49 'USE_SYSTEM_SQLITE',
57 ], 50 ],
58 }, 51 'conditions': [
59 'link_settings': { 52 ['OS != "ios"', {
60 'ldflags': [ 53 'cflags': [
61 '<!@(pkg-config --libs-only-L --libs-only-other sqlite3)', 54 # This next command produces no output but it it will fail
62 ], 55 # (and cause GYP to fail) if we don't have a recent enough
63 'libraries': [ 56 # version of sqlite.
64 '<!@(pkg-config --libs-only-l sqlite3)', 57 '<!@(pkg-config --atleast-version=<(required_sqlite_version) s qlite3)',
58 '<!@(pkg-config --cflags sqlite3)',
59 ],
60 }],
65 ], 61 ],
66 }, 62 },
63
64
65 'conditions': [
66 ['OS == "ios"', {
67 'link_settings': {
68 'libraries': [
69 '$(SDKROOT)/usr/lib/libsqlite3.dylib',
70 ],
71 },
72 },{ # OS != ios
73 'link_settings': {
74 'ldflags': [
75 '<!@(pkg-config --libs-only-L --libs-only-other sqlite3)',
76 ],
77 'libraries': [
78 '<!@(pkg-config --libs-only-l sqlite3)',
79 ],
80 },
81 }],
82 ],
67 }, { # else: os_posix == 1 or OS == "mac" or ! use_system_sqlite 83 }, { # else: os_posix == 1 or OS == "mac" or ! use_system_sqlite
stuartmorgan 2012/07/13 12:18:10 As long as you are here, s/1/0/ so this comment st
68 'product_name': 'sqlite3', 84 'product_name': 'sqlite3',
69 'type': 'static_library', 85 'type': 'static_library',
70 'sources': [ 86 'sources': [
71 'amalgamation/sqlite3.h', 87 'amalgamation/sqlite3.h',
72 'amalgamation/sqlite3.c', 88 'amalgamation/sqlite3.c',
73 # fts2.c currently has a lot of conflicts when added to 89 # fts2.c currently has a lot of conflicts when added to
74 # the amalgamation. It is probably not worth fixing that. 90 # the amalgamation. It is probably not worth fixing that.
75 'src/ext/fts2/fts2.c', 91 'src/ext/fts2/fts2.c',
76 'src/ext/fts2/fts2.h', 92 'src/ext/fts2/fts2.h',
77 'src/ext/fts2/fts2_hash.c', 93 'src/ext/fts2/fts2_hash.c',
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 'src/src/shell_icu_linux.c', 168 'src/src/shell_icu_linux.c',
153 ], 169 ],
154 'link_settings': { 170 'link_settings': {
155 'link_languages': ['c++'], 171 'link_languages': ['c++'],
156 }, 172 },
157 }, 173 },
158 ], 174 ],
159 },] 175 },]
160 ], 176 ],
161 } 177 }
OLDNEW
« build/common.gypi ('K') | « sql/sql.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698