Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cmake: Fix incorrect relative-path concatenation #733

Merged
merged 2 commits into from
Nov 5, 2021

Conversation

nh2
Copy link
Contributor

@nh2 nh2 commented Nov 4, 2021

Fixes incorrect install location of glog-modules.cmake found in NixOS/nixpkgs#144561 (comment)

Please see the commit message for details.


CLA is signed.

nh2 added 2 commits November 4, 2021 01:19
When a `-DCMAKE_INSTALL_PREFIX` is given, this could result in paths
like:

    /path/to/prefix//path/to/prefix/lib/cmake/glog/glog-modules.cmake

which was incorrect.

If a relative DESTINATION is given, it's assumed to be relative to the
install prefix.

Signed-off-by: Niklas Hambüchen <mail@nh2.me>
@coveralls
Copy link
Collaborator

coveralls commented Nov 5, 2021

Coverage Status

Coverage increased (+0.2%) to 76.611% when pulling 57c636c on nh2:fix-cmake-relative-path into 17e7679 on google:master.

@coveralls
Copy link
Collaborator

Coverage Status

Coverage remained the same at 76.434% when pulling 57c636c on nh2:fix-cmake-relative-path into 17e7679 on google:master.

@sergiud sergiud added this to the 0.6 milestone Nov 5, 2021
@sergiud
Copy link
Collaborator

sergiud commented Nov 5, 2021

Thanks!

@sergiud sergiud merged commit 68964b8 into google:master Nov 5, 2021
sergiud added a commit that referenced this pull request Nov 11, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants