Skip to content

Commit adee0a5

Browse files
mkruskal-googlecopybara-github
authored andcommitted
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 protocolbuffers#12672 PiperOrigin-RevId: 529840763
1 parent 3f5d844 commit adee0a5

File tree

2 files changed

+14
-10
lines changed

2 files changed

+14
-10
lines changed

.github/workflows/test_cpp.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ jobs:
116116
- name: Run tests
117117
uses: protocolbuffers/protobuf-ci/docker@v1
118118
with:
119-
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/cmake@sha256:7058879cac0224e443043eae2de82c13a63a54dd31855dac020c5522aa573cd2
119+
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/cmake:3.10.3-1da1e086a7d1863b8bdd181ef6388a02dcd62f3a
120120
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
121121
command: >-
122122
/test.sh ${{ matrix.flags}} ${{ env.CCACHE_CMAKE_FLAGS }}
@@ -142,7 +142,7 @@ jobs:
142142
- name: Run tests
143143
uses: protocolbuffers/protobuf-ci/docker@v1
144144
with:
145-
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/cmake@sha256:7058879cac0224e443043eae2de82c13a63a54dd31855dac020c5522aa573cd2
145+
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/cmake:3.10.3-1da1e086a7d1863b8bdd181ef6388a02dcd62f3a
146146
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
147147
command: >-
148148
/install.sh -DCMAKE_CXX_STANDARD=14 ${{ env.CCACHE_CMAKE_FLAGS }} -Dprotobuf_USE_EXTERNAL_GTEST=ON -Dprotobuf_ABSL_PROVIDER=package \&\&
@@ -171,16 +171,16 @@ jobs:
171171
- name: Run tests
172172
uses: protocolbuffers/protobuf-ci/docker@v1
173173
with:
174-
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/cmake@sha256:7058879cac0224e443043eae2de82c13a63a54dd31855dac020c5522aa573cd2
174+
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/cmake:3.10.3-1da1e086a7d1863b8bdd181ef6388a02dcd62f3a
175175
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
176176
command: >-
177177
/install.sh -DCMAKE_CXX_STANDARD=14 ${{ env.CCACHE_CMAKE_FLAGS }}
178178
-Dprotobuf_USE_EXTERNAL_GTEST=ON -Dprotobuf_ABSL_PROVIDER=package
179179
-Dprotobuf_BUILD_EXAMPLES=OFF \&\&
180-
cd examples \&\&
181-
mkdir build \&\&
182-
cmake -S . -B build -DCMAKE_CXX_STANDARD=14 \&\&
183-
cmake --build build
180+
mkdir examples/build \&\&
181+
cd examples/build \&\&
182+
cmake .. -DCMAKE_CXX_STANDARD=14 \&\&
183+
cmake --build .
184184
185185
linux-cmake-submodules:
186186
name: Linux CMake Submodules
@@ -200,7 +200,7 @@ jobs:
200200
- name: Run tests
201201
uses: protocolbuffers/protobuf-ci/docker@v1
202202
with:
203-
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/cmake@sha256:e0eb6c69b7551d89f0dbdbe11906077a1d501229c28db39623b945e0c5d7029a
203+
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/cmake:3.13.3-1da1e086a7d1863b8bdd181ef6388a02dcd62f3a
204204
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
205205
command: >-
206206
/test.sh ${{ env.CCACHE_CMAKE_FLAGS }}

cmake/install.cmake

+6-2
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)