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

Remove wrong include and modernize example #327

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from

Conversation

stephan-cr
Copy link

No description provided.

@CLAassistant
Copy link

CLAassistant commented Mar 22, 2021

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you sign our Contributor License Agreement before we can accept your contribution.
You have signed the CLA already but the status is still pending? Let us recheck it.

@czoido czoido added this to the 0.17 milestone Mar 23, 2021
@czoido czoido self-assigned this Mar 23, 2021
@czoido
Copy link
Contributor

czoido commented Mar 23, 2021

Hi @stephan-cr,
Thanks a lot for the contribution.
The duplicated include is ok, it is supposed to include the downloaded conan.cmake in case someone uncomments that block of code. If we remove it it will take the file in the root folder instead of the downloaded one.
Also, the cmake_minimum_required should be raised to 3.8 when cxx_std_11 was introduced.

Make use of more modern CMake. Reduce Conan.cmake includes to
"include(conan)", because that's why list(APPEND CMAKE_MODULE_PATH
${CMAKE_BINARY_DIR}) is declared at the top of the example.
@stephan-cr stephan-cr changed the title Remove duplicate include and modernize example Remove wrong include and modernize example Mar 28, 2021
@stephan-cr
Copy link
Author

stephan-cr commented Apr 14, 2021

@czoido Resolved the merge conflict.

I would also propose to include conan.cmake like include(conan), because I think that's the point of having list(APPEND CMAKE_MODULE_PATH ${CMAKE_BINARY_DIR}) at the top.

@czoido czoido modified the milestones: 0.17, 0.18 Nov 19, 2021
@czoido czoido modified the milestones: 0.18, 0.19 Mar 28, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants