test: fixed the way to enable C++ exceptions. (#1061)

PR-URL: nodejs/node-addon-api#1061 Reviewed-By: Michael Dawson <midawson@redhat.com>
johnfrench3 · Sep 3, 2021 · 5ecc9da · 5ecc9da
1 parent 235a8d6
commit 5ecc9da
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 22 deletions.
diff --git a/except.gypi b/except.gypi
@@ -2,15 +2,24 @@
   'defines': [ 'NAPI_CPP_EXCEPTIONS' ],
   'cflags!': [ '-fno-exceptions' ],
   'cflags_cc!': [ '-fno-exceptions' ],
-  'msvs_settings': {
-    'VCCLCompilerTool': {
-      'ExceptionHandling': 1,
-      'EnablePREfast': 'true',
-    },
-  },
-  'xcode_settings': {
-    'CLANG_CXX_LIBRARY': 'libc++',
-    'MACOSX_DEPLOYMENT_TARGET': '10.7',
-    'GCC_ENABLE_CPP_EXCEPTIONS': 'YES',
-  },
+  'conditions': [
+    ["OS=='win'", {
+      "defines": [
+        "_HAS_EXCEPTIONS=1"
+      ],
+      "msvs_settings": {
+        "VCCLCompilerTool": {
+          "ExceptionHandling": 1,
+          'EnablePREfast': 'true',
+        },
+      },
+    }],
+    ["OS=='mac'", {
+      'xcode_settings': {
+        'GCC_ENABLE_CPP_EXCEPTIONS': 'YES',
+        'CLANG_CXX_LIBRARY': 'libc++',
+        'MACOSX_DEPLOYMENT_TARGET': '10.7',
+      },
+    }],
+  ],
 }
diff --git a/noexcept.gypi b/noexcept.gypi
@@ -2,15 +2,25 @@
   'defines': [ 'NAPI_DISABLE_CPP_EXCEPTIONS' ],
   'cflags': [ '-fno-exceptions' ],
   'cflags_cc': [ '-fno-exceptions' ],
-  'msvs_settings': {
-    'VCCLCompilerTool': {
-      'ExceptionHandling': 0,
-      'EnablePREfast': 'true',
-    },
-  },
-  'xcode_settings': {
-    'CLANG_CXX_LIBRARY': 'libc++',
-    'MACOSX_DEPLOYMENT_TARGET': '10.7',
-    'GCC_ENABLE_CPP_EXCEPTIONS': 'NO',
-  },
+  'conditions': [
+    ["OS=='win'", {
+      # _HAS_EXCEPTIONS is already defined and set to 0 in common.gypi
+      #"defines": [
+      #  "_HAS_EXCEPTIONS=0"
+      #],
+      "msvs_settings": {
+        "VCCLCompilerTool": {
+          'ExceptionHandling': 0,
+          'EnablePREfast': 'true',
+        },
+      },
+    }],
+    ["OS=='mac'", {
+      'xcode_settings': {
+        'CLANG_CXX_LIBRARY': 'libc++',
+        'MACOSX_DEPLOYMENT_TARGET': '10.7',
+        'GCC_ENABLE_CPP_EXCEPTIONS': 'NO',
+      },
+    }],
+  ],
 }