Skip to content

build: Use info fetched from version.m4#1006

Open
lcruz99 wants to merge 1 commit intoOpenVPN:masterfrom
lcruz99:cmake_fetch_win_vars_from_version_m4
Open

build: Use info fetched from version.m4#1006
lcruz99 wants to merge 1 commit intoOpenVPN:masterfrom
lcruz99:cmake_fetch_win_vars_from_version_m4

Conversation

@lcruz99
Copy link

@lcruz99 lcruz99 commented Mar 25, 2026

The TAP-Windows driver configuration values (TAP_WIN_COMPONENT_ID, TAP_WIN_MIN_MAJOR, TAP_WIN_MIN_MINOR) are being hardcoded directly in config.h.cmake.in:

#define TAP_WIN_COMPONENT_ID "tap0901"
#define TAP_WIN_MIN_MAJOR 9
#define TAP_WIN_MIN_MINOR 9

These same values are already defined in version.m4 as PRODUCT_TAP_WIN_COMPONENT_ID, PRODUCT_TAP_WIN_MIN_MAJOR, and PRODUCT_TAP_WIN_MIN_MINOR.

This PR makes cmake set these values to the already fetched metadata from version.m4 consistent with how other product version information is already managed.

@lcruz99 lcruz99 marked this pull request as ready for review March 25, 2026 12:26

/* The tap-windows id */
#define TAP_WIN_COMPONENT_ID "tap0901"
#define TAP_WIN_COMPONENT_ID "${TAP_WIN_COMPONENT_ID}"
Copy link
Member

Choose a reason for hiding this comment

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

Should use @TAP_WIN_COMPONENT_ID@ to be consistent with the rest of the file

Copy link
Author

Choose a reason for hiding this comment

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

that's right, will change

@lcruz99 lcruz99 force-pushed the cmake_fetch_win_vars_from_version_m4 branch from af3892c to 766252e Compare March 26, 2026 10:07
@lcruz99 lcruz99 requested a review from flichtenheld March 26, 2026 10:08
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.

2 participants