diff options
author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-02-21 17:15:31 +0200 |
---|---|---|
committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-02-21 17:22:26 +0200 |
commit | bfd5ad3220e7abe928daca98605012c1a12ae377 (patch) | |
tree | 1238c17671e7c069c87208b506fa092385fab13b /platform/linux | |
parent | 8219d72135c007c44b61a781c95c817a8618c478 (diff) | |
download | qtlocation-mapboxgl-bfd5ad3220e7abe928daca98605012c1a12ae377.tar.gz |
[gyp] Coverage only if BUILDTYPE=Debug and ENABLE_COVERAGE=1
Coverage compiler and linker flags are used only when (1) in debug build
and (2) with ENABLE_COVERAGE set to 1. Besides, because OS X's libtool
is unable to understand '--coverage', this linker flag is only used
genrating executable targets. Also, using 'link_settings' to specify
linker options and separate instructions for OSX and Linux.
Diffstat (limited to 'platform/linux')
-rw-r--r-- | platform/linux/mapboxgl-app.gypi | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/platform/linux/mapboxgl-app.gypi b/platform/linux/mapboxgl-app.gypi index 19c17f6249..a2c61e9d3b 100644 --- a/platform/linux/mapboxgl-app.gypi +++ b/platform/linux/mapboxgl-app.gypi @@ -39,31 +39,27 @@ 'conditions': [ ['OS == "mac"', { - 'libraries': [ '<@(libraries)' ], 'xcode_settings': { 'SDKROOT': 'macosx', 'SUPPORTED_PLATFORMS':'macosx', 'OTHER_CPLUSPLUSFLAGS': [ '<@(cflags_cc)' ], - 'OTHER_LDFLAGS': [ '<@(ldflags)' ], - 'SDKROOT': 'macosx', 'MACOSX_DEPLOYMENT_TARGET': '10.10', }, - 'configurations': { - 'Debug': { - 'xcode_settings': { - 'conditions': [ - ['enable_coverage=="1"', { - 'OTHER_LDFLAGS': [ '--coverage' ], - }], - ], - }, - }, - }, }, { 'cflags_cc': [ '<@(cflags_cc)' ], - 'libraries': [ '<@(libraries)', '<@(ldflags)' ], }] ], + + 'link_settings': { + 'conditions': [ + ['OS == "mac"', { + 'libraries': [ '<@(libraries)' ], + 'xcode_settings': { 'OTHER_LDFLAGS': [ '<@(ldflags)' ] } + }, { + 'libraries': [ '<@(libraries)', '<@(ldflags)' ], + }] + ], + }, }, ], } |