From: Luis Cruz Date: Tue, 14 Apr 2026 12:56:37 +0000 (+0200) Subject: build: Use info fetched from version.m4 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fbaf4a3837cddf73694e30a5b01e012e41246b79;p=thirdparty%2Fopenvpn.git build: Use info fetched from version.m4 Change-Id: I3157e1a228ac7058fca6a88f94076052e33d2e01 Signed-off-by: Luis Cruz Acked-by: Frank Lichtenheld Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1605 Message-Id: <20260414125637.42082-1-frank@lichtenheld.com> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg36612.html Signed-off-by: Gert Doering --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 198c98ff3..72e349c7f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 diff --git a/config.h.cmake.in b/config.h.cmake.in index a93fcd51f..ae1d2643d 100644 --- a/config.h.cmake.in +++ b/config.h.cmake.in @@ -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@ /* 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