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

Refactor find vorbis file cmake #6671

Merged

Conversation

bencsikandrei
Copy link
Contributor

A couple of changes for consistency with the other modules + a small commit to state the minimum requirements for Boost and CMake which were a bit behind.

As always, tested as much I could, the link.txt file is looking good, same as compile_commands.json.

I was thinking, would it be interesting to move the FindXXX files in a cmake/modules folder? That way they're separate from other cmake utilities.

Also, since I've embarked in this journey, and haven't yet seen the whole history of the project, have there been efforts to unite the SDL2 find? I'm thinking about unifying windows/*nix finders with a couple of tricks but I'd like to see if there have been other efforts. Of course, it's fine even if there weren't and it may actually be impossible, but I'd like to try.

Thanks!

@github-actions github-actions bot added Building Build-time issues. CMake Issues involving the CMake build system. labels May 2, 2022
@Pentarctagon
Copy link
Member

Also, since I've embarked in this journey, and haven't yet seen the whole history of the project, have there been efforts to unite the SDL2 find? I'm thinking about unifying windows/*nix finders with a couple of tricks but I'd like to see if there have been other efforts. Of course, it's fine even if there weren't and it may actually be impossible, but I'd like to try.

Feel free to try, of course. It's kind of a mess though as the comments around it in the root CMakeLists.txt notes.

I was thinking, would it be interesting to move the FindXXX files in a cmake/modules folder? That way they're separate from other cmake utilities.

I don't have a preference either way.

@@ -36,28 +36,14 @@ http://code.google.com/p/osgaudio/source/browse/trunk/CMakeModules/FindVorbisFil
set(VORBISFILE_SEARCH_PATHS
~/Library/Frameworks
/Library/Frameworks
/usr/local
/usr/local
Copy link
Contributor Author

Choose a reason for hiding this comment

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

spaces -> tabs

@Pentarctagon Pentarctagon merged commit ea83e36 into wesnoth:master May 2, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Building Build-time issues. CMake Issues involving the CMake build system.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants