Skip to content

build: Use info fetched from version.m4 #1006

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.

Sign up for GitHub

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

Open
lcruz99 wants to merge 1 commit into
base: master
Choose a base branch
from
+7 −3
Open

build: Use info fetched from version.m4 #1006

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,10 @@ set(OPENVPN_VERSION_MINOR ${PRODUCT_VERSION_MINOR})
set(OPENVPN_VERSION_PATCH ${PRODUCT_VERSION_PATCH})
set(OPENVPN_VERSION_RESOURCE ${PRODUCT_VERSION_RESOURCE})

set(TAP_WIN_COMPONENT_ID "${PRODUCT_TAP_WIN_COMPONENT_ID}")
set(TAP_WIN_MIN_MAJOR ${PRODUCT_TAP_WIN_MIN_MAJOR})
set(TAP_WIN_MIN_MINOR ${PRODUCT_TAP_WIN_MIN_MINOR})

set(CMAKE_C_STANDARD 11)

# Set the various defines for config.h.cmake.in
Expand Down
6 changes: 3 additions & 3 deletions config.h.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,13 +366,13 @@
#undef SYSTEMD_ASK_PASSWORD_PATH

/* The tap-windows id */
#define TAP_WIN_COMPONENT_ID "tap0901"
#define TAP_WIN_COMPONENT_ID "@TAP_WIN_COMPONENT_ID@"

/* The tap-windows version number is required for OpenVPN */
#define TAP_WIN_MIN_MAJOR 9
#define TAP_WIN_MIN_MAJOR "@TAP_WIN_MIN_MAJOR@"
Copy link
Copy Markdown
Member

@flichtenheld flichtenheld Apr 1, 2026

Choose a reason for hiding this comment

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

No, you over-corrected. Here the " are wrong.


/* The tap-windows version number is required for OpenVPN */
#define TAP_WIN_MIN_MINOR 9
#define TAP_WIN_MIN_MINOR "@TAP_WIN_MIN_MINOR@"

/* Are we running on Mac OS X? */
#cmakedefine TARGET_DARWIN
Expand Down
Loading