Skip to content

Commit 22e5314

Browse files
authored
cleanup: consolidate repetitive config.pc.in files (#9010)
1 parent 74b933c commit 22e5314

161 files changed

Lines changed: 96 additions & 2165 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.

generator/internal/scaffold_generator.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -505,7 +505,7 @@ string(CONCAT GOOGLE_CLOUD_PC_REQUIRES "google_cloud_cpp_grpc_utils"
505505
" google_cloud_cpp_common" " google_cloud_cpp_$library$_protos")
506506
507507
# Create and install the pkg-config files.
508-
configure_file("$${PROJECT_SOURCE_DIR}/google/cloud/$library$/config.pc.in"
508+
configure_file("$${PROJECT_SOURCE_DIR}/cmake/templates/config.pc.in"
509509
"google_cloud_cpp_$library$.pc" @ONLY)
510510
install(
511511
FILES "$${CMAKE_CURRENT_BINARY_DIR}/google_cloud_cpp_$library$.pc"

google/cloud/accessapproval/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ string(CONCAT GOOGLE_CLOUD_PC_REQUIRES "google_cloud_cpp_grpc_utils"
177177
" google_cloud_cpp_accessapproval_protos")
178178

179179
# Create and install the pkg-config files.
180-
configure_file("${PROJECT_SOURCE_DIR}/google/cloud/accessapproval/config.pc.in"
180+
configure_file("${PROJECT_SOURCE_DIR}/cmake/templates/config.pc.in"
181181
"google_cloud_cpp_accessapproval.pc" @ONLY)
182182
install(
183183
FILES "${CMAKE_CURRENT_BINARY_DIR}/google_cloud_cpp_accessapproval.pc"

google/cloud/accesscontextmanager/CMakeLists.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -183,9 +183,8 @@ string(CONCAT GOOGLE_CLOUD_PC_REQUIRES "google_cloud_cpp_grpc_utils"
183183
" google_cloud_cpp_accesscontextmanager_protos")
184184

185185
# Create and install the pkg-config files.
186-
configure_file(
187-
"${PROJECT_SOURCE_DIR}/google/cloud/accesscontextmanager/config.pc.in"
188-
"google_cloud_cpp_accesscontextmanager.pc" @ONLY)
186+
configure_file("${PROJECT_SOURCE_DIR}/cmake/templates/config.pc.in"
187+
"google_cloud_cpp_accesscontextmanager.pc" @ONLY)
189188
install(
190189
FILES "${CMAKE_CURRENT_BINARY_DIR}/google_cloud_cpp_accesscontextmanager.pc"
191190
DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig"

google/cloud/accesscontextmanager/config.pc.in

Lines changed: 0 additions & 26 deletions
This file was deleted.

google/cloud/apigateway/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ string(CONCAT GOOGLE_CLOUD_PC_REQUIRES "google_cloud_cpp_grpc_utils"
170170
" google_cloud_cpp_common" " google_cloud_cpp_apigateway_protos")
171171

172172
# Create and install the pkg-config files.
173-
configure_file("${PROJECT_SOURCE_DIR}/google/cloud/apigateway/config.pc.in"
173+
configure_file("${PROJECT_SOURCE_DIR}/cmake/templates/config.pc.in"
174174
"google_cloud_cpp_apigateway.pc" @ONLY)
175175
install(
176176
FILES "${CMAKE_CURRENT_BINARY_DIR}/google_cloud_cpp_apigateway.pc"

google/cloud/apigateway/config.pc.in

Lines changed: 0 additions & 26 deletions
This file was deleted.

google/cloud/apigeeconnect/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ string(CONCAT GOOGLE_CLOUD_PC_REQUIRES "google_cloud_cpp_grpc_utils"
177177
" google_cloud_cpp_apigeeconnect_protos")
178178

179179
# Create and install the pkg-config files.
180-
configure_file("${PROJECT_SOURCE_DIR}/google/cloud/apigeeconnect/config.pc.in"
180+
configure_file("${PROJECT_SOURCE_DIR}/cmake/templates/config.pc.in"
181181
"google_cloud_cpp_apigeeconnect.pc" @ONLY)
182182
install(
183183
FILES "${CMAKE_CURRENT_BINARY_DIR}/google_cloud_cpp_apigeeconnect.pc"

google/cloud/apigeeconnect/config.pc.in

Lines changed: 0 additions & 26 deletions
This file was deleted.

google/cloud/appengine/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ string(CONCAT GOOGLE_CLOUD_PC_REQUIRES "google_cloud_cpp_grpc_utils"
169169
" google_cloud_cpp_common" " google_cloud_cpp_appengine_protos")
170170

171171
# Create and install the pkg-config files.
172-
configure_file("${PROJECT_SOURCE_DIR}/google/cloud/appengine/config.pc.in"
172+
configure_file("${PROJECT_SOURCE_DIR}/cmake/templates/config.pc.in"
173173
"google_cloud_cpp_appengine.pc" @ONLY)
174174
install(
175175
FILES "${CMAKE_CURRENT_BINARY_DIR}/google_cloud_cpp_appengine.pc"

0 commit comments

Comments
 (0)