Update to Protobuf 23.4.0 (#1626)

* Update to protobuf v23.4.0

* Add defines for 3rd party sub-modules used by protobuf

* Check out sub-modules recursively
This commit is contained in:
LordGrey 2023-07-29 19:28:51 +02:00 committed by GitHub
parent 5bf25c98ad
commit c0dc08b0c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 8 deletions

View File

@ -86,7 +86,7 @@ jobs:
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
with: with:
submodules: true submodules: recursive
- name: Generate environment variables - name: Generate environment variables
run: | run: |

View File

@ -34,7 +34,7 @@ jobs:
- name: Checkout - name: Checkout
uses: actions/checkout@v3 uses: actions/checkout@v3
with: with:
submodules: true submodules: recursive
# Append PR number to .version # Append PR number to .version
- name: Append PR number to version - name: Append PR number to version
@ -78,7 +78,7 @@ jobs:
- name: Checkout - name: Checkout
uses: actions/checkout@v3 uses: actions/checkout@v3
with: with:
submodules: true submodules: recursive
# Append PR number to .version # Append PR number to .version
- name: Append PR number to version - name: Append PR number to version
@ -127,7 +127,7 @@ jobs:
- name: Checkout - name: Checkout
uses: actions/checkout@v3 uses: actions/checkout@v3
with: with:
submodules: true submodules: recursive
# Append PR number to .version # Append PR number to .version
- name: Append PR number to version - name: Append PR number to version

View File

@ -35,7 +35,7 @@ jobs:
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
with: with:
submodules: true submodules: recursive
# Build process # Build process
- name: Build packages - name: Build packages
@ -64,7 +64,7 @@ jobs:
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
with: with:
submodules: true submodules: recursive
# Install dependencies # Install dependencies
- name: Install dependencies - name: Install dependencies
@ -99,7 +99,7 @@ jobs:
- name: Checkout - name: Checkout
uses: actions/checkout@v3 uses: actions/checkout@v3
with: with:
submodules: true submodules: recursive
- name: Install Qt - name: Install Qt
uses: jurplel/install-qt-action@v3 uses: jurplel/install-qt-action@v3

View File

@ -160,6 +160,10 @@ if(ENABLE_PROTOBUF_SERVER)
# define the protobuf library # define the protobuf library
set(PROTOBUF_LIBRARIES protobuf::libprotobuf) set(PROTOBUF_LIBRARIES protobuf::libprotobuf)
# defines for 3rd party sub-modules
set(ABSL_PROPAGATE_CXX_STD ON CACHE BOOL "Build abseil-cpp with C++ version requirements propagated")
endif() endif()
# redefine at parent scope # redefine at parent scope

@ -1 +1 @@
Subproject commit f0dc78d7e6e331b8c6bb2d5283e06aa26883ca7c Subproject commit 2c5fa078d8e86e5f4bd34e6f4c9ea9e8d7d4d44a