Skip to content

Add Conan support#728

Merged
dmah42 merged 1 commit intogoogle:masterfrom
Croydon:croydon/conan_minimal
Jan 3, 2019
Merged

Add Conan support#728
dmah42 merged 1 commit intogoogle:masterfrom
Croydon:croydon/conan_minimal

Conversation

@Croydon
Copy link
Contributor

@Croydon Croydon commented Nov 26, 2018

This is split from #647

It only contains the minimum changes to get initial Conan support.

With this changes you can create a Conan package by executing

conan create . benchmark/<version-number>@google/stable

or better: to actual test if the package works, the test_package should be executed with it:

conan create . benchmark/<version-number>@google/stable -tf conan/test_package

(the parameter tf stands for test folder).

If no error appears the created Benchmark Conan package can be consumed by projects locally.


This does NOT contain any kind of publishing/uploading mechanism with mass building for different configurations/operating systems etc. this should be eventually done via #647


cc @memsharded @dominichamon

@coveralls
Copy link

coveralls commented Nov 26, 2018

Coverage Status

Coverage remained the same at 89.41% when pulling bf88397 on Croydon:croydon/conan_minimal into 4528c76 on google:master.

@AppVeyorBot
Copy link

Build benchmark 1575 completed (commit 29b778268a by @Croydon)

@Croydon Croydon force-pushed the croydon/conan_minimal branch from eb57359 to bf88397 Compare December 16, 2018 10:58
@Croydon
Copy link
Contributor Author

Croydon commented Dec 16, 2018

I have actually reconsidered and removed CONAN_RUN_TESTS and enable_gtest_tests for the sake of simplification. The tests for Benchmark should be continued to run via plain CMake as it is done so far.

Please review this @dominichamon

@dmah42 dmah42 merged commit eec9a8e into google:master Jan 3, 2019
@dmah42
Copy link
Member

dmah42 commented Jan 3, 2019

Thank you all!

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.

7 participants