Skip to content

Commit e0b5130

Browse files
coryancoryan
authored
cleanup: use CMake's string(JOIN) (#11970)
1 parent dda0bb8 commit e0b5130

124 files changed

Lines changed: 275 additions & 272 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎cmake/AddPkgConfig.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ function (google_cloud_cpp_add_pkgconfig library name description)
4545
set(target "google_cloud_cpp_${library}")
4646
set(GOOGLE_CLOUD_CPP_PC_NAME "${name}")
4747
set(GOOGLE_CLOUD_CPP_PC_DESCRIPTION "${description}")
48-
string(CONCAT GOOGLE_CLOUD_CPP_PC_REQUIRES ${ARGN})
48+
string(JOIN " " GOOGLE_CLOUD_CPP_PC_REQUIRES ${ARGN})
4949
google_cloud_cpp_set_pkgconfig_paths()
5050
get_target_property(target_type ${target} TYPE)
5151
if ("${target_type}" STREQUAL "INTERFACE_LIBRARY")

‎cmake/CompileProtos.cmake‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -468,13 +468,13 @@ macro (external_googleapis_install_pc_common target)
468468
list(
469469
APPEND
470470
_target_pc_requires
471-
" grpc++"
472-
" grpc"
473-
" openssl"
474-
" protobuf"
475-
" zlib"
476-
" libcares")
477-
string(CONCAT GOOGLE_CLOUD_CPP_PC_REQUIRES ${_target_pc_requires})
471+
"grpc++"
472+
"grpc"
473+
"openssl"
474+
"protobuf"
475+
"zlib"
476+
"libcares")
477+
string(JOIN " " GOOGLE_CLOUD_CPP_PC_REQUIRES ${_target_pc_requires})
478478
get_target_property(_target_type ${target} TYPE)
479479
if ("${_target_type}" STREQUAL "INTERFACE_LIBRARY")
480480
set(GOOGLE_CLOUD_CPP_PC_LIBS "")

‎generator/internal/scaffold_generator.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -642,8 +642,8 @@ google_cloud_cpp_add_pkgconfig(
642642
"The $title$ C++ Client Library"
643643
"Provides C++ APIs to use the $title$."
644644
"google_cloud_cpp_grpc_utils"
645-
" google_cloud_cpp_common"
646-
" google_cloud_cpp_$library$_protos")
645+
"google_cloud_cpp_common"
646+
"google_cloud_cpp_$library$_protos")
647647
648648
# Create and install the CMake configuration files.
649649
include(CMakePackageConfigHelpers)

‎google/cloud/accessapproval/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,8 +177,8 @@ google_cloud_cpp_add_pkgconfig(
177177
"The Access Approval API C++ Client Library"
178178
"Provides C++ APIs to use the Access Approval API."
179179
"google_cloud_cpp_grpc_utils"
180-
" google_cloud_cpp_common"
181-
" google_cloud_cpp_accessapproval_protos")
180+
"google_cloud_cpp_common"
181+
"google_cloud_cpp_accessapproval_protos")
182182

183183
# Create and install the CMake configuration files.
184184
include(CMakePackageConfigHelpers)

‎google/cloud/accesscontextmanager/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,8 +183,8 @@ google_cloud_cpp_add_pkgconfig(
183183
"The Access Context Manager API C++ Client Library"
184184
"Provides C++ APIs to use the Access Context Manager API."
185185
"google_cloud_cpp_grpc_utils"
186-
" google_cloud_cpp_common"
187-
" google_cloud_cpp_accesscontextmanager_protos")
186+
"google_cloud_cpp_common"
187+
"google_cloud_cpp_accesscontextmanager_protos")
188188

189189
# Create and install the CMake configuration files.
190190
include(CMakePackageConfigHelpers)

‎google/cloud/advisorynotifications/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,8 +181,8 @@ google_cloud_cpp_add_pkgconfig(
181181
"The Advisory Notifications API C++ Client Library"
182182
"Provides C++ APIs to use the Advisory Notifications API."
183183
"google_cloud_cpp_grpc_utils"
184-
" google_cloud_cpp_common"
185-
" google_cloud_cpp_advisorynotifications_protos")
184+
"google_cloud_cpp_common"
185+
"google_cloud_cpp_advisorynotifications_protos")
186186

187187
# Create and install the CMake configuration files.
188188
include(CMakePackageConfigHelpers)

‎google/cloud/aiplatform/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ google_cloud_cpp_install_headers("google_cloud_cpp_aiplatform_mocks"
168168
google_cloud_cpp_add_pkgconfig(
169169
aiplatform "The Vertex AI API C++ Client Library"
170170
"Provides C++ APIs to use the Vertex AI API." "google_cloud_cpp_grpc_utils"
171-
" google_cloud_cpp_common" " google_cloud_cpp_aiplatform_protos")
171+
"google_cloud_cpp_common" "google_cloud_cpp_aiplatform_protos")
172172

173173
# Create and install the CMake configuration files.
174174
include(CMakePackageConfigHelpers)

‎google/cloud/alloydb/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ google_cloud_cpp_install_headers("google_cloud_cpp_alloydb_mocks"
165165
google_cloud_cpp_add_pkgconfig(
166166
alloydb "The AlloyDB API C++ Client Library"
167167
"Provides C++ APIs to use the AlloyDB API." "google_cloud_cpp_grpc_utils"
168-
" google_cloud_cpp_common" " google_cloud_cpp_alloydb_protos")
168+
"google_cloud_cpp_common" "google_cloud_cpp_alloydb_protos")
169169

170170
# Create and install the CMake configuration files.
171171
include(CMakePackageConfigHelpers)

‎google/cloud/apigateway/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,8 @@ google_cloud_cpp_add_pkgconfig(
172172
"The API Gateway API C++ Client Library"
173173
"Provides C++ APIs to use the API Gateway API."
174174
"google_cloud_cpp_grpc_utils"
175-
" google_cloud_cpp_common"
176-
" google_cloud_cpp_apigateway_protos")
175+
"google_cloud_cpp_common"
176+
"google_cloud_cpp_apigateway_protos")
177177

178178
# Create and install the CMake configuration files.
179179
include(CMakePackageConfigHelpers)

‎google/cloud/apigeeconnect/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,8 +177,8 @@ google_cloud_cpp_add_pkgconfig(
177177
"The Apigee Connect API C++ Client Library"
178178
"Provides C++ APIs to use the Apigee Connect API."
179179
"google_cloud_cpp_grpc_utils"
180-
" google_cloud_cpp_common"
181-
" google_cloud_cpp_apigeeconnect_protos")
180+
"google_cloud_cpp_common"
181+
"google_cloud_cpp_apigeeconnect_protos")
182182

183183
# Create and install the CMake configuration files.
184184
include(CMakePackageConfigHelpers)

0 commit comments

Comments
 (0)