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

Support user-provided gmock/gtest #205

Merged
merged 3 commits into from
Mar 20, 2019

Conversation

xhochy
Copy link
Collaborator

@xhochy xhochy commented Mar 19, 2019

Building in a conda environment where gtest and gmock are installed is
currently causing weird linking issues. Instead of failing, we should
just use the one from the environment and don't build our own.

Sadly CMake's built-in FindGTest.cmake doesn't support GMock so I've
bundled the modified version from Apache Arrow.

Building in a conda environment where gtest and gmock are installed is
currently causing weird linking issues. Instead of failing, we should
just use the one from the environment and don't build our own.

Sadly CMake's built-in `FindGTest.cmake` doesn't support GMock so I've
bundled the modified version from Apache Arrow.
@codecov-io
Copy link

codecov-io commented Mar 19, 2019

Codecov Report

Merging #205 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master     #205   +/-   ##
=======================================
  Coverage   98.68%   98.68%           
=======================================
  Files         145      145           
  Lines        3338     3338           
=======================================
  Hits         3294     3294           
  Misses         44       44

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 18834cb...e37cc3e. Read the comment docs.

@MathMagique
Copy link
Member

Please add a Changelog entry, other than that, no objections :-)

@xhochy
Copy link
Collaborator Author

xhochy commented Mar 20, 2019

Please add a Changelog entry, other than that, no objections :-)

Done

@MathMagique MathMagique merged commit b11f0a1 into blue-yonder:master Mar 20, 2019
@MathMagique
Copy link
Member

Thanks a lot, Uwe!

@xhochy xhochy deleted the support-conda-gmock branch March 21, 2019 09:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants