diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2016-05-02 12:00:03 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-05-02 13:12:24 -0700 |
| commit | 7800445c85b29f60b8f5ff265122182035af6ff0 (patch) | |
| tree | b52f49e8e5c88a9e88ccded3c8e1da18e6086b9a | |
| parent | 34f9618d31532c7872bef4529eaa138527a320c9 (diff) | |
| download | qtlocation-mapboxgl-7800445c85b29f60b8f5ff265122182035af6ff0.tar.gz | |
[core] Use gyp's direct_dependent_settings to propagate variant cflags
| -rw-r--r-- | bin/glfw.gypi | 2 | ||||
| -rw-r--r-- | mbgl.gypi | 11 | ||||
| -rw-r--r-- | platform/android/platform.gyp | 1 | ||||
| -rw-r--r-- | platform/ios/platform.gyp | 1 | ||||
| -rw-r--r-- | platform/linux/platform.gyp | 1 | ||||
| -rw-r--r-- | platform/osx/platform.gyp | 1 | ||||
| -rw-r--r-- | platform/qt/platform.gyp | 1 | ||||
| -rw-r--r-- | test/test.gypi | 4 |
8 files changed, 15 insertions, 7 deletions
diff --git a/bin/glfw.gypi b/bin/glfw.gypi index 395b94009f..dbf73e5abe 100644 --- a/bin/glfw.gypi +++ b/bin/glfw.gypi @@ -6,6 +6,7 @@ 'type': 'executable', 'dependencies': [ + 'core', 'platform-lib', 'copy_certificate_bundle', ], @@ -27,7 +28,6 @@ 'variables': { 'cflags_cc': [ '<@(glfw_cflags)', - '<@(variant_cflags)', ], 'ldflags': [ '<@(glfw_ldflags)', @@ -283,6 +283,17 @@ }] ], }, + + 'direct_dependent_settings': { + 'cflags_cc': [ + '<@(variant_cflags)', + ], + 'xcode_settings': { + 'OTHER_CPLUSPLUSFLAGS': [ + '<@(variant_cflags)', + ], + }, + }, }, { 'target_name': 'copy_certificate_bundle', diff --git a/platform/android/platform.gyp b/platform/android/platform.gyp index 599aa586ce..ce243e493e 100644 --- a/platform/android/platform.gyp +++ b/platform/android/platform.gyp @@ -51,7 +51,6 @@ '<@(rapidjson_cflags)', '<@(nunicode_cflags)', '<@(sqlite_cflags)', - '<@(variant_cflags)', '<@(jni.hpp_cflags)', '<@(libzip_cflags)', '<@(libpng_cflags)', diff --git a/platform/ios/platform.gyp b/platform/ios/platform.gyp index 6458a55f2c..e4abff27e3 100644 --- a/platform/ios/platform.gyp +++ b/platform/ios/platform.gyp @@ -113,7 +113,6 @@ '<@(sqlite_cflags)', '<@(zlib_cflags)', '<@(rapidjson_cflags)', - '<@(variant_cflags)', ], 'ldflags': [ '<@(sqlite_ldflags)', diff --git a/platform/linux/platform.gyp b/platform/linux/platform.gyp index 4bef3e69cd..236f0619f7 100644 --- a/platform/linux/platform.gyp +++ b/platform/linux/platform.gyp @@ -75,7 +75,6 @@ '<@(nunicode_cflags)', '<@(sqlite_cflags)', '<@(rapidjson_cflags)', - '<@(variant_cflags)', '<@(libcurl_cflags)', '<@(libpng_cflags)', '<@(libjpeg-turbo_cflags)', diff --git a/platform/osx/platform.gyp b/platform/osx/platform.gyp index 6b9915f5d5..c3f94935d3 100644 --- a/platform/osx/platform.gyp +++ b/platform/osx/platform.gyp @@ -70,7 +70,6 @@ '<@(sqlite_cflags)', '<@(zlib_cflags)', '<@(rapidjson_cflags)', - '<@(variant_cflags)', ], 'CLANG_ENABLE_OBJC_ARC': 'YES', 'CLANG_ENABLE_MODULES': 'YES', diff --git a/platform/qt/platform.gyp b/platform/qt/platform.gyp index 53b3e5fa02..dc43e0200f 100644 --- a/platform/qt/platform.gyp +++ b/platform/qt/platform.gyp @@ -83,7 +83,6 @@ '<@(qt_network_cflags)', '<@(rapidjson_cflags)', '<@(sqlite_cflags)', - '<@(variant_cflags)', '<@(webp_cflags)', '-fPIC', ], diff --git a/test/test.gypi b/test/test.gypi index 4f0726eb16..a9e53c88fc 100644 --- a/test/test.gypi +++ b/test/test.gypi @@ -5,6 +5,9 @@ 'type': 'static_library', 'standalone_static_library': 1, 'hard_dependency': 1, + 'dependencies': [ + 'core', + ], 'include_dirs': [ '../include', @@ -87,7 +90,6 @@ '<@(geojsonvt_cflags)', '<@(rapidjson_cflags)', '<@(pixelmatch_cflags)', - '<@(variant_cflags)', ], 'ldflags': [ '<@(gtest_ldflags)', |