mirror of
https://github.com/hyperion-project/hyperion.ng.git
synced 2023-10-10 13:36:59 +02:00
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:
parent
5bf25c98ad
commit
c0dc08b0c0
2
.github/workflows/nightly.yml
vendored
2
.github/workflows/nightly.yml
vendored
@ -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: |
|
||||||
|
6
.github/workflows/pull-request.yml
vendored
6
.github/workflows/pull-request.yml
vendored
@ -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
|
||||||
|
6
.github/workflows/push-master.yml
vendored
6
.github/workflows/push-master.yml
vendored
@ -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
|
||||||
|
4
dependencies/CMakeLists.txt
vendored
4
dependencies/CMakeLists.txt
vendored
@ -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
|
||||||
|
2
dependencies/external/protobuf
vendored
2
dependencies/external/protobuf
vendored
@ -1 +1 @@
|
|||||||
Subproject commit f0dc78d7e6e331b8c6bb2d5283e06aa26883ca7c
|
Subproject commit 2c5fa078d8e86e5f4bd34e6f4c9ea9e8d7d4d44a
|
Loading…
Reference in New Issue
Block a user