Skip to content

Commit

Permalink
Add WIL configurations to the gyp build script
Browse files Browse the repository at this point in the history
- Add the WIL directory to the include path
- Define __WI_LIBCPP_HAS_NO_IS_AGGREGATE in VC++ 2017 as WIL doesn't build as it is  microsoft/wil#25

PiperOrigin-RevId: 526162487
  • Loading branch information
yuryu authored and hiroyuki-komatsu committed Apr 21, 2023
1 parent 0ce1f9b commit 426ac5e
Showing 1 changed file with 9 additions and 0 deletions.
9 changes: 9 additions & 0 deletions src/gyp/common_win.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -333,6 +333,7 @@
'<(SHARED_INTERMEDIATE_DIR)',
'<(absl_dir)',
'<@(msvs_includes)',
'<(third_party_dir)/wil/include',
'<(wtl_dir)/include',
],
'msvs_configuration_attributes': {
Expand Down Expand Up @@ -394,5 +395,13 @@
],
},
},
'conditions': [
['MSVS_VERSION=="2017"', {
'defines': [
# Workaround for WIL https://github.com/microsoft/wil/issues/25
'__WI_LIBCPP_HAS_NO_IS_AGGREGATE',
],
}],
],
},
}

0 comments on commit 426ac5e

Please sign in to comment.