Skip to content

[cmake] improved stdalign.h workaround for windows build#32777

Merged
jtattermusch merged 1 commit intogrpc:masterfrom
jtattermusch:followup_32764
Apr 5, 2023
Merged

[cmake] improved stdalign.h workaround for windows build#32777
jtattermusch merged 1 commit intogrpc:masterfrom
jtattermusch:followup_32764

Conversation

@jtattermusch
Copy link
Copy Markdown
Contributor

@jtattermusch jtattermusch commented Apr 3, 2023

Improved the workaround from #32764 as suggested in #32764 (comment).

Once merged, I'll backport to 1.54.x and 1.53.x together with #32764 (these have switched to VS2019)

@jtattermusch jtattermusch requested a review from veblush April 3, 2023 07:01
@jtattermusch jtattermusch added the release notes: no Indicates if PR should not be in release notes label Apr 3, 2023
@jtattermusch
Copy link
Copy Markdown
Contributor Author

Adhoc windows/grpc_portability run http://sponge/68f4cc3e-9e17-4cd4-9b28-48bc97e3eb87

@rem Always use the newest Windows 10 SDK available.
@rem A new-enough Windows 10 SDK that supports C++11's stdalign.h is required
@rem for a successful build.
@rem For some reason, by default cmake together with visual studio generator
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: Can probably rephrase the "For some reason" bit now, since we know why it's happening. (It prefers the Windows 10 SDK whose version number happens to match the host OS's version number.)

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

@davidben
Copy link
Copy Markdown
Contributor

davidben commented Apr 4, 2023

BTW, won't help us until it's released and such, but future CMake should hopefully be better here.
https://gitlab.kitware.com/cmake/cmake/-/merge_requests/8389

@jtattermusch jtattermusch enabled auto-merge (squash) April 4, 2023 17:54
@jtattermusch
Copy link
Copy Markdown
Contributor Author

Bump to kick the title check.

@jtattermusch jtattermusch changed the title [cmake] Improved stdalign.h workaround for windows build [cmake] improved stdalign.h workaround for windows build Apr 5, 2023
@jtattermusch jtattermusch merged commit b9f0c01 into grpc:master Apr 5, 2023
jtattermusch added a commit to jtattermusch/grpc that referenced this pull request Apr 5, 2023
Improved the workaround from grpc#32764 as
suggested in
grpc#32764 (comment).

Once merged, I'll backport to 1.54.x and 1.53.x together with
grpc#32764 (these have switched to VS2019)
jtattermusch added a commit to jtattermusch/grpc that referenced this pull request Apr 5, 2023
Improved the workaround from grpc#32764 as
suggested in
grpc#32764 (comment).

Once merged, I'll backport to 1.54.x and 1.53.x together with
grpc#32764 (these have switched to VS2019)
@copybara-service copybara-service bot added the imported Specifies if the PR has been imported to the internal repository label Apr 5, 2023
jtattermusch added a commit that referenced this pull request Apr 6, 2023
veblush pushed a commit that referenced this pull request Apr 13, 2023
XuanWang-Amos pushed a commit to XuanWang-Amos/grpc that referenced this pull request May 1, 2023
Improved the workaround from grpc#32764 as
suggested in
grpc#32764 (comment).

Once merged, I'll backport to 1.54.x and 1.53.x together with
grpc#32764 (these have switched to VS2019)
wanlin31 pushed a commit that referenced this pull request May 18, 2023
Improved the workaround from #32764 as
suggested in
#32764 (comment).

Once merged, I'll backport to 1.54.x and 1.53.x together with
#32764 (these have switched to VS2019)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bloat/none imported Specifies if the PR has been imported to the internal repository per-call-memory/neutral per-channel-memory/neutral release notes: no Indicates if PR should not be in release notes

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants