raylib: add some common build settings to options #24585

Julianiolo · 2024-07-11T10:57:29Z

Summary

Changes to recipe: raylib/*

Motivation

raylib defines a lot of build settings in config.h. I added some of the most common/important ones to the recipe options

Details

We just patch the config.h file to match the options. This seems to be the easiest way to do this, and it makes the config.h file mirror the current configuration (although that file is currently not exported; I guess this is relevant to that: #24472).

Read the contributing guidelines
Checked that this PR is not a duplicate: list of PRs by recipe
Tested locally with at least one configuration using a recent version of Conan

AbrilRBS

Thanks @Julianiolo for taking the time to add the options :)

recipes/raylib/all/conanfile.py

Co-authored-by: Abril Rincón Blanco <[email protected]>

uilianries · 2024-07-15T11:35:54Z

As this configuration is not exposed as project option, I would suggest using Conan configuration to pass any custom definition to the compiler instead:

https://docs.conan.io/2/reference/config_files/global_conf.html

You can add it to your profile, or use via command line directly:

conan create all --version=5.0 -c 'tools.build:defines=["SUPPORT_MODULE_RTEXTURES", "SUPPORT_MODULE_RAUDIO"]'

This configuration will pass -DSUPPORT_MODULE_RTEXTURES -DSUPPORT_MODULE_RAUDIO directly to the compiler. The -D is automatically added by CMake, Conan passes those definition to the build tool actually.

As it may affect the package ID, in case changing the result of the library behavior, you still can inject that configuration as part of the package ID as well:

conan create all --version=5.0 -c 'tools.build:defines=["SUPPORT_MODULE_RTEXTURES", "SUPPORT_MODULE_RAUDIO"]' -c 'tools.info.package_id:confs=["tools.build:defines"]'

So, in summary tools.info.package_id:confs will change the package ID according to defines listed in the tools.build:defines, in case you change that values, it will result in a different package ID as well.

Julianiolo · 2024-07-15T14:01:15Z

@uilianries I think they are intended as project options, raylib just manages them via this config.h file, not via some build script. (as It also has build scripts for like 5+ different build systems)

The intention is to be able to set these options from a consuming recipe, would that even be possible with the configuration?

uilianries · 2024-07-15T14:43:54Z

@Julianiolo I'm reading raylib cmake files and indeed those options are exposed: https://github.com/raysan5/raylib/blob/5.0/CMakeOptions.txt#L31. Why passing via CMakeToolchain.variables does not work?

The intention is to be able to set these options from a consuming recipe, would that even be possible with the configuration?

Configurations work for both cases, building and consuming.

Julianiolo · 2024-07-15T21:24:00Z

Oh WOW, how did I not see that lol, I was looking at the wrong CMakeLists.txt....

Julianiolo · 2024-07-15T21:52:53Z

I just saw this, I guess this might just be the solution to #24472? Unless there are more relevant files.

uilianries · 2024-07-16T06:04:40Z

@Julianiolo That could work, but need to test first. Thank for spotting it.

recipes/raylib/all/conanfile.py

uilianries · 2024-07-16T06:06:56Z

recipes/raylib/all/conanfile.py

+        true_false = lambda x: True if x else False
+        tc.variables["SUPPORT_MODULE_RSHAPES"]   = true_false(self.options.module_rshapes)


Suggested change

true_false = lambda x: True if x else False

tc.variables["SUPPORT_MODULE_RSHAPES"] = true_false(self.options.module_rshapes)

tc.variables["SUPPORT_MODULE_RSHAPES"] = self.options.module_rshapes

The OptionValue is converted to boolean already, you should not need another helper function.

uilianries · 2024-07-16T06:11:48Z

recipes/raylib/all/conanfile.py

    }
    default_options = {
        "shared": False,
        "fPIC": True,
        "opengl_version": None,
+
+        "module_rshapes": True,


I would suggest adding only option that you really need for now, otherwise, it will increase the recipe maintenance. We can not validate each combination, which means there is a risk breaking things depending the combination.

I also would request a build log, if possible, using the options that you are adding, I mean, using the non-default option value, to make sure it's not broken. I asking it because we found recipes with custom options that are not working and the CI really does not check it (only shared, fPIC and header_only are checked), so any user opens an issue months later reporting about that option is broken and recipe/upstream is bugged.

Co-authored-by: Uilian Ries <[email protected]>

Julianiolo · 2024-07-16T09:34:31Z

@uilianries I just saw this: raysan5/raylib@307c998

So I guess maybe the patching approach is actually more future safe?

On second thought, why does it parse the config.h to then produce cmake options, when it could just include the config.h in the code??

uilianries · 2024-07-16T10:43:02Z

On second thought, why does it parse the config.h to then produce cmake options, when it could just include the config.h in the code??

@Julianiolo because we avoid patching anything as we will become the maintainers of that patch.

The project offers transparent options via CMake, and it reflects to the Conan generator CMaketoolchain, that's is well prepared and integrated to work with the project, and we have been using it for any other project. So, using CMake will consume less maintenance from our side.

Julianiolo · 2024-07-16T20:38:05Z

@uilianries No, with that commit, it does not support options via cmake anymore (or am I reading this wrong?)
The commit is newer than 5.0

I'm going to investigate this...

Julianiolo · 2024-07-16T21:08:35Z

Ok, turns out I was reading that completely wrong, lol
It generates the cmake options from config.h, everything should work as before

Julianiolo · 2024-07-17T14:29:44Z

So now I removed some options, and added a on_off converter, as I had some problems just passing the booleans to cmake.

@uilianries Do you mean by build logs just the output from conan create all/conanfile.py .... ? I can certainly do that :)

…er-index into raylib_cfc

uilianries · 2024-10-08T15:24:10Z

does that also work for the test package? I tried it and it does not seem to work.

@Julianiolo What do you mean exactly? The test package should receive the include dirs from Conan generators, like CMakeDeps. In the test pacakge, you should not need to configure dependencies include dirs, only consume them.

Julianiolo · 2024-10-08T19:03:15Z

@uilianries well we copy the headers in the test package ( the def generate(self): copy(self, pattern="rcamera.h", src=self.dependencies["raylib"].cpp_info.resdirs[0], dst=os.path.join(self.build_folder, "raylib_stuff"))), but then how do we add that directory to the include directories?

Julianiolo · 2024-10-18T20:13:38Z

@uilianries any idea on this?

uilianries · 2024-10-18T20:34:57Z

@uilianries any idea on this?

Hello @Julianiolo ! I'm on vacation 🌴, please, ping @conan-io/barbarians for further support. I should be back by next week. Have a nice day

Julianiolo · 2024-10-20T16:11:14Z

@uilianries ah sorry then, have a nice vacation :)

Signed-off-by: Uilian Ries <[email protected]>

uilianries · 2024-10-31T09:14:41Z

@Julianiolo Hello again! I reviewed this PR again and tested locally. Please, consider the PR Julianiolo#1 as my review/fixing.

[raylib] Simplify custom modules options

recipes/raylib/all/conanfile.py

Co-authored-by: Uilian Ries <[email protected]>

Julianiolo · 2024-10-31T15:22:09Z

@uilianries how did this fail again?

Also, why does it even suddenly need that policy?

Also also, how does Conan 1 fail with a compile error? (This is the problem that raylib defines functions with the same name as windows.h. For that reason raylib does not normally include that (but I guess something did?))

uilianries · 2024-10-31T15:55:57Z

@Julianiolo You have to revert the commit 08dc263

This recipe has patches and they are needed! https://github.com/conan-io/conan-center-index/tree/master/recipes/raylib/all/patches

Julianiolo · 2024-10-31T18:24:28Z

@uilianries OH, you are right...

The Recipe linter gave me an error about them being unused (see), I guess that is a bug...

uilianries · 2024-10-31T18:31:07Z

The Recipe linter gave me an error about them being unused (see), I guess that is a bug...

@Julianiolo You are right, it's a bug! Good catch. It's because the version 5.0 does not have any patch. Will open an issue reporting the case, thank you!

conan-center-bot · 2024-10-31T19:02:34Z

Conan v1 pipeline ✔️

Warning

Conan Center will stop receiving updates for Conan 1.x packages soon - please see announcement.

All green in build 16 (eb91ffd8b70bc67c3bddd1dd87c417d05c46912b):

raylib/3.5.0:
Built 20 packages out of 22 (All logs)
raylib/4.0.0:
Built 20 packages out of 22 (All logs)
raylib/5.0:
Built 20 packages out of 22 (All logs)

Conan v2 pipeline ✔️

Note: Conan v2 builds are now mandatory. Please read our discussion about it.

All green in build 16 (eb91ffd8b70bc67c3bddd1dd87c417d05c46912b):

raylib/5.0:
All packages built successfully! (All logs)
raylib/4.0.0:
All packages built successfully! (All logs)
raylib/3.5.0:
All packages built successfully! (All logs)

uilianries

LGTM

AbrilRBS

Thanks!

* support custom frame control * add some more common settings * Update recipes/raylib/all/conanfile.py Co-authored-by: Abril Rincón Blanco <[email protected]> * moved from patching defines to cmake options * Update recipes/raylib/all/conanfile.py Co-authored-by: Uilian Ries <[email protected]> * reduce number of options * reduced number of options, added on_off converter * removed some options * incorporated review * add camera, gestures and rprand support * added resdirs * Simplify custom modules headers Signed-off-by: Uilian Ries <[email protected]> * Include headers from version 3.5.0 Signed-off-by: Uilian Ries <[email protected]> * fix rprand typo * fix linter warnings * Update recipes/raylib/all/conanfile.py Co-authored-by: Uilian Ries <[email protected]> * readd patches --------- Signed-off-by: Uilian Ries <[email protected]> Co-authored-by: Abril Rincón Blanco <[email protected]> Co-authored-by: Uilian Ries <[email protected]>

Julianiolo added 2 commits July 11, 2024 12:35

support custom frame control

62e4104

add some more common settings

cf5f29e

This comment has been minimized.

Sign in to view

AbrilRBS self-assigned this Jul 11, 2024

AbrilRBS previously approved these changes Jul 15, 2024

View reviewed changes

recipes/raylib/all/conanfile.py Outdated Show resolved Hide resolved

Update recipes/raylib/all/conanfile.py

9fae9a8

Co-authored-by: Abril Rincón Blanco <[email protected]>

Julianiolo dismissed AbrilRBS’s stale review via 9fae9a8 July 15, 2024 10:10

This comment has been minimized.

Sign in to view

AbrilRBS assigned uilianries Jul 15, 2024

moved from patching defines to cmake options

f3052b5

This comment has been minimized.

Sign in to view

uilianries reviewed Jul 16, 2024

View reviewed changes

Julianiolo and others added 2 commits July 16, 2024 11:03

Update recipes/raylib/all/conanfile.py

7b9c193

Co-authored-by: Uilian Ries <[email protected]>

reduce number of options

414694b

This comment has been minimized.

Sign in to view

reduced number of options, added on_off converter

e0f1d2c

conan-center-bot added the Service Under Maintenance label Jul 17, 2024

This comment has been minimized.

Sign in to view

Merge branch 'raylib_cfc' of https://github.com/Julianiolo/conan-cent…

9f81c3d

…er-index into raylib_cfc

uilianries added 2 commits October 31, 2024 09:32

Simplify custom modules headers

2061516

Signed-off-by: Uilian Ries <[email protected]>

Include headers from version 3.5.0

f82c6bc

Signed-off-by: Uilian Ries <[email protected]>

uilianries mentioned this pull request Oct 31, 2024

[raylib] Simplify custom modules options Julianiolo/conan-center-index#1

Merged

3 tasks

Julianiolo added 3 commits October 31, 2024 12:27

fix rprand typo

f593ceb

Merge pull request #1 from uilianries/raylib_cfc

4587193

[raylib] Simplify custom modules options

fix linter warnings

08dc263

This comment has been minimized.

Sign in to view

uilianries reviewed Oct 31, 2024

View reviewed changes

recipes/raylib/all/conanfile.py Outdated Show resolved Hide resolved

Update recipes/raylib/all/conanfile.py

026bdfa

Co-authored-by: Uilian Ries <[email protected]>

This comment has been minimized.

Sign in to view

readd patches

eb91ffd

conan-center-bot removed the Failed label Oct 31, 2024

uilianries approved these changes Oct 31, 2024

View reviewed changes

AbrilRBS approved these changes Nov 1, 2024

View reviewed changes

conan-center-bot merged commit c42b245 into conan-io:master Nov 1, 2024
16 checks passed

Julianiolo deleted the raylib_cfc branch November 7, 2024 12:13

AbrilRBS mentioned this pull request Dec 2, 2024

raylib: Add some useful headers to res folder #24472

Closed

AbrilRBS mentioned this pull request Dec 10, 2024

[package] raylib/5.0: Missing rcamera.h header #24368

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

raylib: add some common build settings to options #24585

raylib: add some common build settings to options #24585

Julianiolo commented Jul 11, 2024 •

edited

Loading

This comment has been minimized.

AbrilRBS left a comment

This comment has been minimized.

uilianries commented Jul 15, 2024

Julianiolo commented Jul 15, 2024 •

edited

Loading

uilianries commented Jul 15, 2024

Julianiolo commented Jul 15, 2024

Julianiolo commented Jul 15, 2024

This comment has been minimized.

uilianries commented Jul 16, 2024

uilianries Jul 16, 2024

uilianries Jul 16, 2024

Julianiolo commented Jul 16, 2024 •

edited

Loading

This comment has been minimized.

uilianries commented Jul 16, 2024

Julianiolo commented Jul 16, 2024 •

edited

Loading

Julianiolo commented Jul 16, 2024

This comment has been minimized.

Julianiolo commented Jul 17, 2024

uilianries commented Oct 8, 2024

Julianiolo commented Oct 8, 2024

Julianiolo commented Oct 18, 2024

uilianries commented Oct 18, 2024

Julianiolo commented Oct 20, 2024

uilianries commented Oct 31, 2024

This comment has been minimized.

This comment has been minimized.

Julianiolo commented Oct 31, 2024 •

edited

Loading

uilianries commented Oct 31, 2024

Julianiolo commented Oct 31, 2024 •

edited

Loading

uilianries commented Oct 31, 2024

conan-center-bot commented Oct 31, 2024

uilianries left a comment

AbrilRBS left a comment

		true_false = lambda x: True if x else False
		tc.variables["SUPPORT_MODULE_RSHAPES"] = true_false(self.options.module_rshapes)

raylib: add some common build settings to options #24585

raylib: add some common build settings to options #24585

Conversation

Julianiolo commented Jul 11, 2024 • edited Loading

Summary

Motivation

Details

This comment has been minimized.

AbrilRBS left a comment

Choose a reason for hiding this comment

This comment has been minimized.

uilianries commented Jul 15, 2024

Julianiolo commented Jul 15, 2024 • edited Loading

uilianries commented Jul 15, 2024

Julianiolo commented Jul 15, 2024

Julianiolo commented Jul 15, 2024

This comment has been minimized.

uilianries commented Jul 16, 2024

uilianries Jul 16, 2024

Choose a reason for hiding this comment

uilianries Jul 16, 2024

Choose a reason for hiding this comment

Julianiolo commented Jul 16, 2024 • edited Loading

This comment has been minimized.

uilianries commented Jul 16, 2024

Julianiolo commented Jul 16, 2024 • edited Loading

Julianiolo commented Jul 16, 2024

This comment has been minimized.

Julianiolo commented Jul 17, 2024

uilianries commented Oct 8, 2024

Julianiolo commented Oct 8, 2024

Julianiolo commented Oct 18, 2024

uilianries commented Oct 18, 2024

Julianiolo commented Oct 20, 2024

uilianries commented Oct 31, 2024

This comment has been minimized.

This comment has been minimized.

Julianiolo commented Oct 31, 2024 • edited Loading

uilianries commented Oct 31, 2024

Julianiolo commented Oct 31, 2024 • edited Loading

uilianries commented Oct 31, 2024

conan-center-bot commented Oct 31, 2024

Conan v1 pipeline ✔️

Conan v2 pipeline ✔️

uilianries left a comment

Choose a reason for hiding this comment

AbrilRBS left a comment

Choose a reason for hiding this comment

Julianiolo commented Jul 11, 2024 •

edited

Loading

Julianiolo commented Jul 15, 2024 •

edited

Loading

Julianiolo commented Jul 16, 2024 •

edited

Loading

Julianiolo commented Jul 16, 2024 •

edited

Loading

Julianiolo commented Oct 31, 2024 •

edited

Loading

Julianiolo commented Oct 31, 2024 •

edited

Loading