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.

Sign up for GitHub

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

Jump to bottom

imagl: Patching sources' CMakeLists.txt to use find_package instead of legacy conan 1.X cmake generator #19942

Merged
merged 19 commits into from
Jun 7, 2024
Merged

imagl: Patching sources' CMakeLists.txt to use find_package instead of legacy conan 1.X cmake generator #19942

merged 19 commits into from
Jun 7, 2024

Conversation

Woazim
Copy link
Contributor

@Woazim Woazim commented Sep 18, 2023

imaGL sources use conan to deal with its own dependencies. Some patches already remove conan calls in sources' CMakeLists.txt, but CMakeLists.txt expects that conan use the old conan 1.X cmake generator.

I made new patches to remove the need of cmake generator and use find_package instead which seems to be a better practice.

Woazim and others added 17 commits March 25, 2023 02:39
@Woazim
Updating imagl recipe for conan 2.0
651f713
@Woazim
adding src_folder parameter to cmake_layout to please linter
2aa087c
@Woazim
Back to minimum conan 1.59
f2ed927
@Woazim
Inspired by zlib recipe and now it passes v1 hooks.
55d8eec
@Woazim
Do not use validate_build(), but validate() instead
17654ca
@Woazim
Applying jwillikers suggestions.
b280aac
@Woazim
Final endline added
4271583
@Woazim @jwillikers
add cmake_find_package_multi generator as jwillikers suggests it.
6a55ea3 
Co-authored-by: Jordan Williams <jordan@jwillikers.com>
@Woazim
Merge branch 'master' into master
92c000c
@Woazim
Removing base_path from patches and a useless _cmake member of ImaglC…
dd115a3 
…onan class
@danimtb
Merge branch 'master' into master
6f63195
@danimtb
Merge branch 'master' into master
40bed51
@danimtb
Merge branch 'master' into master
1e58218
@Woazim
-Switch to github URLs since my GitLab instance is temporarily down
f00b152 
-Change license name to uppercase
@Woazim
Merge branch 'master' of https://github.com/Woazim/conan-center-index
3c475ca
@Woazim
Merge branch 'master' of https://github.com/Woazim/conan-center-index
3bc66a5 
# Conflicts:
#	recipes/imagl/all/conanfile.py
#	recipes/imagl/all/test_package/CMakeLists.txt
@Woazim
Patching sources' CMakeLists.txt to make it compatible with conan 2.0…
b0bda29 
…+ by using find_package instead of old conan 1.X cmake generator
@conan-center-bot

This comment has been minimized.

Sign in to view
@conan-center-bot

This comment has been minimized.

Sign in to view
@conan-center-bot

This comment has been minimized.

Sign in to view
@prince-chrismc prince-chrismc mentioned this pull request Sep 18, 2023
Open
This was referenced Mar 17, 2024
Closed
Merged
jcar87
jcar87 approved these changes Jun 6, 2024
View reviewed changes
Copy link
Contributor

@jcar87 jcar87 left a comment

Choose a reason for hiding this comment

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

thanks @Woazim !

AbrilRBS
AbrilRBS approved these changes Jun 6, 2024
View reviewed changes
Copy link
Member

@AbrilRBS AbrilRBS left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Thanks! SOrry for the delay on getting this reviewed :)

@AbrilRBS AbrilRBS self-assigned this Jun 6, 2024
@conan-center-bot

This comment has been minimized.

Sign in to view
@conan-center-bot
Copy link
Collaborator

Conan v1 pipeline ✔️

All green in build 1 (9110ca94bfb4089dee205ee2332a02436dd03369):

  • imagl/0.1.0:
    All packages built successfully! (All logs)

  • imagl/0.1.1:
    All packages built successfully! (All logs)

  • imagl/0.2.1:
    All packages built successfully! (All logs)

  • imagl/0.1.2:
    All packages built successfully! (All logs)

@conan-center-bot conan-center-bot merged commit 4b6396d into conan-io:master Jun 7, 2024
26 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AbrilRBS AbrilRBS AbrilRBS approved these changes

@jcar87 jcar87 jcar87 approved these changes

@valgur valgur valgur approved these changes

@uilianries uilianries Awaiting requested review from uilianries

@franramirez688 franramirez688 Awaiting requested review from franramirez688

Assignees

@AbrilRBS AbrilRBS

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@Woazim @conan-center-bot @valgur @jcar87 @AbrilRBS @danimtb