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

[build] Clean up CMake files #6802

Merged
merged 16 commits into from
Jul 11, 2024
Merged

Conversation

Gold856
Copy link
Contributor

@Gold856 Gold856 commented Jul 4, 2024

Explicitly list required components when using FindJava and FindJNI
Consolidate find_package calls for Java, JNI, and OpenCV into the root CMakeLists.txt file
Remove references to main_lib_dest (left over by #5580 and #5644 being merged in one go)
Install missing generated headers
Flatten some if statements
Use LinkMacOSGUI macro instead of hand rolling it
Stop installing OpenCV libraries and an extra ntcorejni library; OpenCV JAR will still be installed to make it easy to use
Only print platform version on Windows
Prevent GUI modules from being built when wpimath is off, which would otherwise cause a build failure
Simplify build configuration checks
Clean up fieldImages JAR creation
Place built JARs in the same subdir as installed JARs
Remove unnecessary JAR includes
Remove extra directories in target_include_directories
Improve CMake docs

@Gold856 Gold856 requested review from PeterJohnson and a team as code owners July 4, 2024 04:43
Copy link
Contributor

github-actions bot commented Jul 4, 2024

This PR modifies commands. Please open a corresponding PR in Python Commands and include a link to this PR.

@Gold856
Copy link
Contributor Author

Gold856 commented Jul 4, 2024

Doesn't impact RobotPy

CMakeLists.txt Outdated Show resolved Hide resolved
@Gold856 Gold856 force-pushed the cmake-cleanup branch 4 times, most recently from 1fe70fa to d28670d Compare July 5, 2024 08:23
@Gold856 Gold856 force-pushed the cmake-cleanup branch 3 times, most recently from d6bc2cc to ad416ae Compare July 9, 2024 06:29
@PeterJohnson PeterJohnson merged commit bf75c03 into wpilibsuite:main Jul 11, 2024
33 checks passed
@Gold856 Gold856 deleted the cmake-cleanup branch July 11, 2024 22:17
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.

5 participants