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

Side by Side Diff: build/linux/system.gyp

Issue 5016001: unit_tests: Fix link error (missing libXi) on Linux (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 10 years, 1 month 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | 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) 2009 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2009 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 'conditions': [ 6 'conditions': [
7 ['sysroot!=""', { 7 ['sysroot!=""', {
8 'variables': { 8 'variables': {
9 'pkg-config': './pkg-config-wrapper "<(sysroot)"', 9 'pkg-config': './pkg-config-wrapper "<(sysroot)"',
10 }, 10 },
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
227 }, 227 },
228 }], 228 }],
229 # When XInput2 is available (i.e. inputproto version is 2.0), the 229 # When XInput2 is available (i.e. inputproto version is 2.0), the
230 # pkg-config command will succeed, so the output will be empty. 230 # pkg-config command will succeed, so the output will be empty.
231 ['"<!@(<(pkg-config) --atleast-version=2.0 inputproto || echo $?)"==""', { 231 ['"<!@(<(pkg-config) --atleast-version=2.0 inputproto || echo $?)"==""', {
232 'direct_dependent_settings': { 232 'direct_dependent_settings': {
233 'defines': [ 233 'defines': [
234 'HAVE_XINPUT2', 234 'HAVE_XINPUT2',
235 ], 235 ],
236 }, 236 },
237 'link_settings': {
238 'ldflags': [
239 '<!@(<(pkg-config) --libs-only-L --libs-only-other xi)',
240 ],
241 'libraries': [
242 '<!@(<(pkg-config) --libs-only-l xi)',
243 ],
244 }
237 }], 245 }],
238 ], 246 ],
239 }, 247 },
240 { 248 {
241 'target_name': 'xext', 249 'target_name': 'xext',
242 'type': 'settings', 250 'type': 'settings',
243 'conditions': [ 251 'conditions': [
244 ['_toolset=="target"', { 252 ['_toolset=="target"', {
245 'direct_dependent_settings': { 253 'direct_dependent_settings': {
246 'cflags': [ 254 'cflags': [
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
358 ], 366 ],
359 }, 367 },
360 ], 368 ],
361 } 369 }
362 370
363 # Local Variables: 371 # Local Variables:
364 # tab-width:2 372 # tab-width:2
365 # indent-tabs-mode:nil 373 # indent-tabs-mode:nil
366 # End: 374 # End:
367 # vim: set expandtab tabstop=2 shiftwidth=2: 375 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« 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