Skip to content

Commit e89fe71

Browse files
authored
Update to latest dependencies
Update to latest dependencies
2 parents 49512f8 + d6b08a4 commit e89fe71

File tree

3 files changed

+38
-8
lines changed

3 files changed

+38
-8
lines changed

.github/workflows/qt5_6.yml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ jobs:
5353
with:
5454
repository: hyperion-project/hyperion.ng
5555
submodules: recursive
56+
fetch-depth: 0 # Ensures all tags are fetched
5657
path: hyperion
5758

5859
- name: 👷 Build
@@ -64,9 +65,11 @@ jobs:
6465
-v "${{ github.workspace }}:/source:rw" \
6566
-w "/source" \
6667
ghcr.io/hyperion-project/${{ env.DOCKER_IMAGE }}:${{ env.DOCKER_TAG }} \
67-
/bin/bash -c "cmake --preset linux-${{ inputs.build_type }} -DHYPERION_DIR=/source/hyperion -DPLATFORM=${{ matrix.os.platform }} &&
68-
cmake --build --preset linux-${{ inputs.build_type }} --target install --parallel $(nproc) &&
69-
cp -a /source/build/install/. /deploy/ 2>/dev/null"
68+
/bin/bash -c "
69+
git config --global --add safe.directory /source &&
70+
cmake --preset linux-${{ inputs.build_type }} -DHYPERION_DIR=/source/hyperion -DPLATFORM=${{ matrix.os.platform }} &&
71+
cmake --build --preset linux-${{ inputs.build_type }} --target install --parallel $(nproc) &&
72+
cp -a /source/build/install/. /deploy/ 2>/dev/null"
7073
env:
7174
DOCKER_IMAGE: ${{ matrix.os.distribution }}
7275
DOCKER_TAG: ${{ matrix.os.codename }}${{ matrix.os.qt_version == '6' && '-qt6' || '' }}
@@ -102,6 +105,7 @@ jobs:
102105
with:
103106
repository: hyperion-project/hyperion.ng
104107
submodules: recursive
108+
fetch-depth: 0 # Ensures all tags are fetched
105109
path: hyperion
106110

107111
- name: 📥 Install Qt
@@ -140,16 +144,18 @@ jobs:
140144
architecture: [ arm64, x64 ]
141145

142146
steps:
147+
143148
- name: ⬇ Checkout
144149
uses: actions/checkout@v5
145150
with:
146151
submodules: recursive
147-
152+
148153
- name: ⬇ Clone hyperion.ng repository
149154
uses: actions/checkout@v5
150155
with:
151156
repository: hyperion-project/hyperion.ng
152157
submodules: recursive
158+
fetch-depth: 0 # Ensures all tags are fetched
153159
path: hyperion
154160

155161
- name: 📥 Install Python

CMakeLists.txt

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -246,16 +246,25 @@ endif()
246246
#=============================================================================
247247

248248
cmake_path(SET ProtocolBuffers ${HYPERION_DIR}/dependencies/external/protobuf)
249-
FetchContent_Declare(protobuf SOURCE_DIR ${ProtocolBuffers})
249+
FetchContent_Declare(protobuf
250+
SOURCE_DIR ${ProtocolBuffers}
251+
PATCH_COMMAND git apply ${CMAKE_CURRENT_SOURCE_DIR}/patch/protobuf.diff
252+
)
253+
254+
# Enable ProtoBuf verbose mode
255+
set(protobuf_VERBOSE OFF CACHE BOOL "Build protobuf verbose")
250256

251257
# Disable build of Protobuf tests
252258
set(protobuf_BUILD_TESTS OFF CACHE INTERNAL "Build protobuf with tests")
253259

254260
# Disable build of Protobuf with zlib support
255261
set(protobuf_WITH_ZLIB OFF CACHE INTERNAL "Build protobuf with zlib support")
256262

257-
# Disable build of libupb
258-
set(protobuf_BUILD_LIBUPB OFF CACHE INTERNAL "Build libupb")
263+
# Enable build of libupb
264+
set(protobuf_BUILD_LIBUPB ON CACHE INTERNAL "Build libupb")
265+
266+
# Force all dependencies to be downloaded from GitHub
267+
set(protobuf_FORCE_FETCH_DEPENDENCIES ON CACHE INTERNAL "Force all dependencies to be downloaded from GitHub")
259268

260269
# Build abseil (3rd party sub-module) with C++ version requirements
261270
set(ABSL_PROPAGATE_CXX_STD ON CACHE INTERNAL "Build abseil-cpp with C++ version requirements propagated")
@@ -319,4 +328,4 @@ if(MSVC)
319328
-DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}
320329
-DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
321330
)
322-
endif()
331+
endif()

patch/protobuf.diff

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
diff --git a/cmake/protobuf-configure-target.cmake b/cmake/protobuf-configure-target.cmake
2+
index c67c57056..171e0a8f0 100644
3+
--- a/cmake/protobuf-configure-target.cmake
4+
+++ b/cmake/protobuf-configure-target.cmake
5+
@@ -7,8 +7,8 @@
6+
7+
# Refactors configuration options set on all Protobuf targets
8+
function(protobuf_configure_target target)
9+
- if(protobuf_LINK_LIBATOMIC)
10+
- target_link_libraries(libprotobuf PRIVATE atomic)
11+
+ if(protobuf_LINK_LIBATOMIC AND "${target}" STREQUAL "libprotobuf")
12+
+ target_link_libraries("${target}" PRIVATE atomic)
13+
endif()
14+
15+
target_compile_features("${target}" PUBLIC cxx_std_17)

0 commit comments

Comments
 (0)