Major CMake Cleanup #38
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
- Simplify CMake config in to curses or win32 versions
- Use CMake features more effectively
- Require curses library be ncurses
These seem to have been copied from the autoconf config.h.in, but those are added automatically by default by autoconf. We don't actually use or need these checks so remove them (if we don't have stdio.h, we've got bigger problems!).
- Use builtin WIN32 variable for Windows conditions - Only build win32 or curses, depending on platform - Make curses required, no need to check if found - Require curses library be NCurses - Move subproject conditions up to main CMakeLists.txt, which now gate the add_subdirectory - Add Windows dependencies to their respective targets (lib5250 needs Winsock and tn5250-win needs Winmm for PlaySound) - Remove redundant add_dependencies (target_link_libraries does this already) - Only link OpenSSL libraries if it was found - Rename curses target to tn5250 now that it's mutually exclusive with win32 - Set project definitions through configure_file instead of extraneous add_definitions
|
FWIW, I also have an incomplete branch (no PR yet) to clean up and put CMake at parity, then remove autotools (though we might not be ready for that). This branch has more CMake cleanups, though feel free to cherry pick the CMake changes I've made. I put back Windows lp5250 and the key handling option, but I hadn't yet however gotten around to adding back xt5250, termcaps, or public API lib5250... which I'm not sure if we want to keep anyways. |
Needs testing. This needs to be wired up to the installer as well... which needs to be hooked up via CI or something. Co-authored-by: Korinne Adler <kadler@us.ibm.com>
|
Right now I feel like the CMake build can be the test ground for stuff going forward so I'm fine with not having parity with autoconf build. Especially with stuff like xt5250, lib5250 shared library, termcaps, etc. The Windows lp5250 stuff would likely be good to bring over, though. |
NattyNarwhal
approved these changes
Mar 26, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.