fix: support absolute paths for CMAKE_INSTALL_*DIR
#9022
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
Change the `config.pc.in` template to use our own variables
(`GOOGLE_CLOUD_CPP_PC_{LIB,INCLUDE}DIR`) for the `libdir=` and
`includedir=` values. A new helper CMake macro sets these variables to
`CMAKE_INSTALL_{LIB,INCLUDE}DIR` when these are absolute paths,
otherwise it adds the right prefix.
I changed `cmake-single-feature.sh` to test for this new behavior. Maybe
abusing the build.
|
Google Cloud Build Logs
ℹ️ NOTE: Kokoro logs are linked from "Details" below. |
Codecov Report
@@ Coverage Diff @@
## main #9022 +/- ##
==========================================
- Coverage 94.47% 94.47% -0.01%
==========================================
Files 1422 1422
Lines 125239 125239
==========================================
- Hits 118325 118321 -4
- Misses 6914 6918 +4
Continue to review full report at Codecov.
|
|
Google Cloud Build Logs
ℹ️ NOTE: Kokoro logs are linked from "Details" below. |
|
Google Cloud Build Logs
ℹ️ NOTE: Kokoro logs are linked from "Details" below. |
devbww
approved these changes
May 19, 2022
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.
Change the
config.pc.intemplate to use our own variables(
GOOGLE_CLOUD_CPP_PC_{LIB,INCLUDE}DIR) for thelibdir=andincludedir=values. A new helper CMake macro sets these variables toCMAKE_INSTALL_{LIB,INCLUDE}DIRwhen these are absolute paths,otherwise it adds the right prefix.
I changed
cmake-single-feature.shto test for this new behavior. Maybeabusing the build.
Fixes #8992
This change is