refactor(cmake): use template for config.cmake.in #12487
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dbolduc
changed the title
Codecov ReportPatch and project coverage have no change.
Additional details and impacted files@@ Coverage Diff @@
## main #12487 +/- ##
=======================================
Coverage 93.62% 93.62%
=======================================
Files 2039 2039
Lines 180677 180677
=======================================
+ Hits 169150 169151 +1
+ Misses 11527 11526 -1 ☔ View full report in Codecov by Sentry. |
coryan
approved these changes
Aug 29, 2023
cmake/GoogleCloudCppLibrary.cmake
Outdated
| @@ -57,6 +59,11 @@ function (google_cloud_cpp_add_ga_grpc_library library display_name) | |||
| endif () | |||
| set(DOXYGEN_EXCLUDE_SYMBOLS "internal") | |||
| set(DOXYGEN_EXAMPLE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/quickstart") | |||
| unset(GOOGLE_CLOUD_CPP_DOXYGEN_EXTRA_INCLUDES) | |||
There was a problem hiding this comment.
Starting with CMake 3.12 we can use list(TRANSFORM ...):
https://cmake.org/cmake/help/latest/command/list.html#transform
set(GOOGLE_CLOUD_CPP_DOXYGEN_EXTRA_INCLUDES "${opt_CROSS_LIB_DEPS}")
list(TRANSFORM
GOOGLE_CLOUD_CPP_DOXYGEN_EXTRA_INCLUDES
PREPEND "${PROJECT_BINARY_DIR}/google/cloud/")
cmake/GoogleCloudCppLibrary.cmake
Outdated
| @@ -201,7 +208,16 @@ function (google_cloud_cpp_add_ga_grpc_library library display_name) | |||
|
|
|||
| # Create and install the CMake configuration files. | |||
| include(CMakePackageConfigHelpers) | |||
| configure_file("config.cmake.in" "${library_target}-config.cmake" @ONLY) | |||
| set(GOOGLE_CLOUD_CPP_CONFIG_LIBRARY "${library_target}") | |||
| unset(find_dependencies) | |||
There was a problem hiding this comment.
Done, but I am skeptical as to whether this one was an improvement. I briefly explored list(TRANSFORM ... REPLACE ...), but gave up.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Part of the work for #12483. Also related to #12428 and #12467.
Add explicit support to the client library helper to handle cross library deps. This also cleans up the passing of
GOOGLE_CLOUD_CPP_DOXYGEN_EXTRA_INCLUDESfrom the${library}/CMakeLists.txtas a global. (Of course we later pass it as a global to our doxygen helper functions, but 🤫 )This also introduces a
config.cmake.intemplate and lets us remove 100+ identical${library}/config.cmake.infiles.I plan to update the scaffolding in a follow up. And I might update handwritten libraries like
bigtable,pubsub,spannerwhich have identicalconfig.cmake.in's to the template.This change is