[core] Use gyp's direct_dependent_settings to propagate variant cflags

This commit is contained in:
John Firebaugh
2016-05-02 12:00:03 -07:00
parent 34f9618d31
commit 7800445c85
8 changed files with 15 additions and 7 deletions

View File

@@ -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)',

View File

@@ -283,6 +283,17 @@
}]
],
},
'direct_dependent_settings': {
'cflags_cc': [
'<@(variant_cflags)',
],
'xcode_settings': {
'OTHER_CPLUSPLUSFLAGS': [
'<@(variant_cflags)',
],
},
},
},
{
'target_name': 'copy_certificate_bundle',

View File

@@ -51,7 +51,6 @@
'<@(rapidjson_cflags)',
'<@(nunicode_cflags)',
'<@(sqlite_cflags)',
'<@(variant_cflags)',
'<@(jni.hpp_cflags)',
'<@(libzip_cflags)',
'<@(libpng_cflags)',

View File

@@ -113,7 +113,6 @@
'<@(sqlite_cflags)',
'<@(zlib_cflags)',
'<@(rapidjson_cflags)',
'<@(variant_cflags)',
],
'ldflags': [
'<@(sqlite_ldflags)',

View File

@@ -75,7 +75,6 @@
'<@(nunicode_cflags)',
'<@(sqlite_cflags)',
'<@(rapidjson_cflags)',
'<@(variant_cflags)',
'<@(libcurl_cflags)',
'<@(libpng_cflags)',
'<@(libjpeg-turbo_cflags)',

View File

@@ -70,7 +70,6 @@
'<@(sqlite_cflags)',
'<@(zlib_cflags)',
'<@(rapidjson_cflags)',
'<@(variant_cflags)',
],
'CLANG_ENABLE_OBJC_ARC': 'YES',
'CLANG_ENABLE_MODULES': 'YES',

View File

@@ -83,7 +83,6 @@
'<@(qt_network_cflags)',
'<@(rapidjson_cflags)',
'<@(sqlite_cflags)',
'<@(variant_cflags)',
'<@(webp_cflags)',
'-fPIC',
],

View File

@@ -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)',