Skip to content

Commit 0ce610e

Browse files
Avoid using string(JOIN..., which requires cmake 3.12
This also downgrades our tests to use cmake 3.10, compatible with our support window. Closes #12672 PiperOrigin-RevId: 529840763
1 parent dbb9f9b commit 0ce610e

File tree

2 files changed

+14
-10
lines changed

2 files changed

+14
-10
lines changed

.github/workflows/test_cpp.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ jobs:
117117
- name: Run tests
118118
uses: ./.github/actions/docker
119119
with:
120-
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/cmake@sha256:7058879cac0224e443043eae2de82c13a63a54dd31855dac020c5522aa573cd2
120+
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/cmake:3.10.3-1da1e086a7d1863b8bdd181ef6388a02dcd62f3a
121121
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
122122
command: >-
123123
/test.sh ${{ matrix.flags}} ${{ env.CCACHE_CMAKE_FLAGS }}
@@ -143,7 +143,7 @@ jobs:
143143
- name: Run tests
144144
uses: ./.github/actions/docker
145145
with:
146-
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/cmake@sha256:7058879cac0224e443043eae2de82c13a63a54dd31855dac020c5522aa573cd2
146+
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/cmake:3.10.3-1da1e086a7d1863b8bdd181ef6388a02dcd62f3a
147147
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
148148
command: >-
149149
/install.sh -DCMAKE_CXX_STANDARD=14 ${{ env.CCACHE_CMAKE_FLAGS }} -Dprotobuf_USE_EXTERNAL_GTEST=ON -Dprotobuf_ABSL_PROVIDER=package \&\&
@@ -172,16 +172,16 @@ jobs:
172172
- name: Run tests
173173
uses: ./.github/actions/docker
174174
with:
175-
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/cmake@sha256:7058879cac0224e443043eae2de82c13a63a54dd31855dac020c5522aa573cd2
175+
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/cmake:3.10.3-1da1e086a7d1863b8bdd181ef6388a02dcd62f3a
176176
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
177177
command: >-
178178
/install.sh -DCMAKE_CXX_STANDARD=14 ${{ env.CCACHE_CMAKE_FLAGS }}
179179
-Dprotobuf_USE_EXTERNAL_GTEST=ON -Dprotobuf_ABSL_PROVIDER=package
180180
-Dprotobuf_BUILD_EXAMPLES=OFF \&\&
181-
cd examples \&\&
182-
mkdir build \&\&
183-
cmake -S . -B build -DCMAKE_CXX_STANDARD=14 \&\&
184-
cmake --build build
181+
mkdir examples/build \&\&
182+
cd examples/build \&\&
183+
cmake .. -DCMAKE_CXX_STANDARD=14 \&\&
184+
cmake --build .
185185
186186
linux-cmake-submodules:
187187
name: Linux CMake Submodules
@@ -201,7 +201,7 @@ jobs:
201201
- name: Run tests
202202
uses: protocolbuffers/protobuf-ci/docker@v1
203203
with:
204-
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/cmake@sha256:e0eb6c69b7551d89f0dbdbe11906077a1d501229c28db39623b945e0c5d7029a
204+
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/cmake:3.13.3-1da1e086a7d1863b8bdd181ef6388a02dcd62f3a
205205
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
206206
command: >-
207207
/test.sh ${{ env.CCACHE_CMAKE_FLAGS }}

cmake/install.cmake

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,12 @@ foreach(_target IN LISTS protobuf_ABSL_USED_TARGETS)
66
endforeach()
77
list(APPEND _pc_targets "utf8_range")
88

9-
string(JOIN " " _pc_target_list ${_pc_targets})
10-
set(_protobuf_PC_REQUIRES ${_pc_target_list})
9+
set(_protobuf_PC_REQUIRES "")
10+
set(_sep "")
11+
foreach (_target IN LISTS _pc_target_list)
12+
string(CONCAT _protobuf_PC_REQUIRES "${_protobuf_PC_REQUIRES}" "${_sep}" "${_target}")
13+
set(_sep " ")
14+
endforeach ()
1115

1216
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/protobuf.pc.cmake
1317
${CMAKE_CURRENT_BINARY_DIR}/protobuf.pc @ONLY)

0 commit comments

Comments
 (0)