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

fix: Dissolve more CMake dependencies #1387

Merged
merged 30 commits into from
Mar 6, 2024
Merged

fix: Dissolve more CMake dependencies #1387

merged 30 commits into from
Mar 6, 2024

Conversation

Xiphoseer
Copy link
Contributor

@Xiphoseer Xiphoseer commented Jan 4, 2024

This PR (arguably?) improves the CMake setup a bit. A bunch of folders are now OBJECT libraries and more cmake code was moved to the cmake folder. The global include list has been cut down, and each library now needs to opt in what other libraries to compile against.

Beware that circular dependencies on static libs are possible, but discouraged and can lead to pathological cases when cmake tries to figure out in what order to execute them and may end up with no parallelism at all.

@Xiphoseer Xiphoseer force-pushed the fix/cmake-libs-2 branch 2 times, most recently from 1609348 to bde8d9b Compare January 4, 2024 21:16
@Xiphoseer Xiphoseer marked this pull request as ready for review January 5, 2024 22:44
@Xiphoseer
Copy link
Contributor Author

This PR is still not cleaned up completely, but please help review and test it.

@aronwk-aaron
Copy link
Member

tested that it builds on my local dev laptop (manjaro) and a test server (Ubuntu 18.04)

Jettford
Jettford previously approved these changes Jan 6, 2024
Copy link
Collaborator

@Jettford Jettford left a comment

Choose a reason for hiding this comment

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

Builds and runs on Windows under x64 Clang and MSVC.

Copy link
Collaborator

@EmosewaMC EmosewaMC left a comment

Choose a reason for hiding this comment

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

General formatting comments, comment questions and also there is a submodule version change that may have been unintended

CMakeLists.txt Outdated Show resolved Hide resolved
CMakeLists.txt Outdated Show resolved Hide resolved
CMakeLists.txt Outdated Show resolved Hide resolved
cmake/FindMariaDB.cmake Outdated Show resolved Hide resolved
cmake/FindMariaDB.cmake Outdated Show resolved Hide resolved
dDatabase/MigrationRunner.cpp Outdated Show resolved Hide resolved
dGame/CMakeLists.txt Outdated Show resolved Hide resolved
dGame/dComponents/CMakeLists.txt Outdated Show resolved Hide resolved
dGame/dComponents/CMakeLists.txt Outdated Show resolved Hide resolved
thirdparty/mariadb-connector-cpp Outdated Show resolved Hide resolved
Will fix in another PR.
@EmosewaMC
Copy link
Collaborator

Merge from upstream will resolve the current build failure.

@EmosewaMC
Copy link
Collaborator

mariadb changes

remove 2 more included directories.
remove commented out code
add status to messages
surround include directories with quotes
remove commented out code
remove debug messages
aronwk-aaron
aronwk-aaron previously approved these changes Mar 4, 2024
Copy link
Collaborator

@jadebenn jadebenn left a comment

Choose a reason for hiding this comment

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

CMake is witchcraft!

...but looks good to me.

@jadebenn jadebenn merged commit 554a9a6 into main Mar 6, 2024
4 checks passed
@jadebenn jadebenn deleted the fix/cmake-libs-2 branch March 6, 2024 02:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants