Skip to content

Switch to protobuf's /CMakeLists.txt instead of /cmake/CMakeLists.txt#32678

Merged
jtattermusch merged 1 commit intogrpc:masterfrom
jtattermusch:protobuf_cmake_moved
Mar 22, 2023
Merged

Switch to protobuf's /CMakeLists.txt instead of /cmake/CMakeLists.txt#32678
jtattermusch merged 1 commit intogrpc:masterfrom
jtattermusch:protobuf_cmake_moved

Conversation

@jtattermusch
Copy link
Copy Markdown
Contributor

@jtattermusch jtattermusch commented Mar 22, 2023

Try to react to protocolbuffers/protobuf#12263 and protocolbuffers/protobuf#12295

Protobuf's /cmake/CMakeLists.txt is now deprecated if favor of /CMakeLists.txt

https://github.com/protocolbuffers/protobuf/blob/58ecf38aa521ba812a0c1a0ae9f108dd311c739c/cmake/CMakeLists.txt#L3

In this PR:

  • Adjust cmake/protobuf.cmake to use the right CMakeLists.txt
  • adjust the C++ distribtests accordingly

@jtattermusch jtattermusch added the release notes: no Indicates if PR should not be in release notes label Mar 22, 2023
@jtattermusch jtattermusch changed the title Switch to protobuf CMakeLists.txt in the repo root Switch to protobuf's /CMakeLists.txt instead of /cmake/CMakeLists.txt Mar 22, 2023
@jtattermusch
Copy link
Copy Markdown
Contributor Author

CC @deannagarcia

@jtattermusch jtattermusch requested a review from veblush March 22, 2023 13:55
@jtattermusch jtattermusch marked this pull request as ready for review March 22, 2023 13:55
@jtattermusch jtattermusch requested a review from apolcyn as a code owner March 22, 2023 13:55
@jtattermusch
Copy link
Copy Markdown
Contributor Author

The Android failure is unrelated and also happens on master.

@jtattermusch jtattermusch enabled auto-merge (squash) March 22, 2023 13:58
@jtattermusch jtattermusch merged commit 3fde139 into grpc:master Mar 22, 2023
@copybara-service copybara-service bot added the imported Specifies if the PR has been imported to the internal repository label Mar 22, 2023
jtattermusch added a commit to jtattermusch/grpc that referenced this pull request Mar 24, 2023
…grpc#32678)

Try to react to protocolbuffers/protobuf#12263
and protocolbuffers/protobuf#12295

Protobuf's /cmake/CMakeLists.txt is now deprecated if favor of
/CMakeLists.txt


https://github.com/protocolbuffers/protobuf/blob/58ecf38aa521ba812a0c1a0ae9f108dd311c739c/cmake/CMakeLists.txt#L3

In this PR:
- Adjust `cmake/protobuf.cmake` to use the right CMakeLists.txt
- adjust the C++ distribtests accordingly
jtattermusch added a commit that referenced this pull request Mar 24, 2023
Backports #32678,
#32669,
#32668,
#32662

After this, all windows builds on 1.53.x should be using VS2019 and they
should be stable.
XuanWang-Amos pushed a commit to XuanWang-Amos/grpc that referenced this pull request May 1, 2023
…grpc#32678)

Try to react to protocolbuffers/protobuf#12263
and protocolbuffers/protobuf#12295

Protobuf's /cmake/CMakeLists.txt is now deprecated if favor of
/CMakeLists.txt


https://github.com/protocolbuffers/protobuf/blob/58ecf38aa521ba812a0c1a0ae9f108dd311c739c/cmake/CMakeLists.txt#L3

In this PR:
- Adjust `cmake/protobuf.cmake` to use the right CMakeLists.txt
- adjust the C++ distribtests accordingly
wanlin31 pushed a commit that referenced this pull request May 18, 2023
…#32678)

Try to react to protocolbuffers/protobuf#12263
and protocolbuffers/protobuf#12295

Protobuf's /cmake/CMakeLists.txt is now deprecated if favor of
/CMakeLists.txt


https://github.com/protocolbuffers/protobuf/blob/58ecf38aa521ba812a0c1a0ae9f108dd311c739c/cmake/CMakeLists.txt#L3

In this PR:
- Adjust `cmake/protobuf.cmake` to use the right CMakeLists.txt
- adjust the C++ distribtests accordingly
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 lang/c++ lang/Python 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.

2 participants