reference directly in the target

mmomtchev · Nov 30, 2024 · d925cbb · d925cbb
1 parent 031d2ef
commit d925cbb
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 21 deletions.
diff --git a/cpp_17.gypi b/cpp_17.gypi
@@ -1,22 +1,20 @@
 {
-  'target_defaults': {
-		# node-gyp sets the standard for us and ensures that its include file comes last
-		# this is the only reliable way to override it
-		'cflags_cc/': [ ['exclude', '^-std=(?!gnu\+\+17)'] ],
-		'cflags_cc':[ '-std=gnu++17' ],
-    'xcode_settings': {
-      'OTHER_CPLUSPLUSFLAGS': [
-        '-std=gnu++17'
-      ],
-      'OTHER_CPLUSPLUSFLAGS/': [ ['exclude', '^-std=(?!gnu\+\+17)'] ],
-		},
-		'msvs_settings': {
-      'AdditionalOptions': [
-        '/std:c++17'
-      ],
-      'AdditionalOptions/': [
-        ['exclude', '^[/\-]std:(?!c\+\+17)']
-      ]
-		}
-	}
+  # node-gyp sets the standard for us and ensures that its include file comes last
+  # this is the only reliable way to override it
+  'cflags_cc/': [ ['exclude', '^-std=(?!gnu\+\+17)'] ],
+  'cflags_cc':[ '-std=gnu++17' ],
+  'xcode_settings': {
+    'OTHER_CPLUSPLUSFLAGS': [
+      '-std=gnu++17'
+    ],
+    'OTHER_CPLUSPLUSFLAGS/': [ ['exclude', '^-std=(?!gnu\+\+17)'] ],
+  },
+  'msvs_settings': {
+    'AdditionalOptions': [
+      '/std:c++17'
+    ],
+    'AdditionalOptions/': [
+      ['exclude', '^[/\-]std:(?!c\+\+17)']
+    ]
+  }
 }
diff --git a/deps/libproj/libproj.gyp b/deps/libproj/libproj.gyp
@@ -1,10 +1,10 @@
 {
 	"includes": [
 		"../../common.gypi",
-		"../../cpp_17.gypi"
 	],
 	"targets": [
 		{
+			"includes": [ "../../cpp_17.gypi" ],
 			"target_name": "libproj",
 			"type": "static_library",
 			"cflags_cc": ["-Wno-attributes"],