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

Fix package recipe for CMake Integration #2460

Merged
merged 1 commit into from Jun 15, 2022

Conversation

mjohnsonwy
Copy link
Contributor

Description

Updated the Conan package recipe to add lib/cmake/Catch2 to cpp_info.components["catch2base"].builddirs. This ensures that Conan properly copies the extras/Catch.cmake and extras/CatchAddTests.cmake to the package, which allows CMake intregration to work.

Tested locally with conan create . 3.0.1@local/test and verified it works on Mac OS 11.6 and Windows 10.

GitHub Issues

Closes #2455

Copy link
Contributor

@gegles gegles left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @mjohnsonwy!

@gegles
Copy link
Contributor

gegles commented Jun 13, 2022

@mjohnsonwy are you also gonna submit a PR for the Conan Center recipe here?

Not quite sure what the process is..

@mjohnsonwy
Copy link
Contributor Author

@mjohnsonwy are you also gonna submit a PR for the Conan Center recipe here?

Not quite sure what the process is..

@gegles I can look into that. I'm not sure what the process is either...

@mjohnsonwy
Copy link
Contributor Author

mjohnsonwy commented Jun 13, 2022

@gegles: Turns out there's a new revision of the Catch2 Conan recipe already on Conan Center, as of 3 days ago. Installing the latest revision fixes this issue. Looks like that recipe handles it a bit differently, but the effects are the same.

Edit: The correct package revision is 3fb49604f9c2f729b85ba3115852006824e72cab.

@gegles
Copy link
Contributor

gegles commented Jun 13, 2022

@gegles: Turns out there's a new revision of the Catch2 Conan recipe already on Conan Center, as of 3 days ago. Installing the latest revision fixes this issue. Looks like that recipe handles it a bit differently, but the effects are the same.

Edit: The correct package revision is 3fb49604f9c2f729b85ba3115852006824e72cab.

This is great @mjohnsonwy ! I tried a few days ago and had not seen the change since. After updating, it now works for me.

It's too bad there is this redundancy between the recipe here and the conan center recipe though.

Cheers. G.

@codecov
Copy link

codecov bot commented Jun 13, 2022

Codecov Report

Merging #2460 (fb49a11) into devel (d32fca4) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##            devel    #2460   +/-   ##
=======================================
  Coverage   91.52%   91.52%           
=======================================
  Files         159      159           
  Lines        7512     7512           
=======================================
  Hits         6875     6875           
  Misses        637      637           

@horenmar horenmar added the Building and Packaging Issues affecting build/packaging scripts and utilities label Jun 15, 2022
@horenmar
Copy link
Member

Thanks, lgtm.

@horenmar horenmar merged commit 8110ee9 into catchorg:devel Jun 15, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Building and Packaging Issues affecting build/packaging scripts and utilities
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Conan Package missing Catch.cmake
3 participants