From: "cron2 (Code Review)" Date: Tue, 14 Apr 2026 16:33:52 +0000 In-Reply-To: References: Reply-To: gert@...1296..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641... Message-ID: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="oP7WbBxLIZk="; charset=UTF-8 Subject: [Openvpn-devel] [S] Change in openvpn[master]: build: Use info fetched from version.m4 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: flichtenheld Cc: plaisthos , openvpn-devel --oP7WbBxLIZk= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/16= 05?usp=3Demail ) Change subject: build: Use info fetched from version.m4 ...................................................................... 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@...2641...> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg36= 612.html Signed-off-by: Gert Doering --- M CMakeLists.txt M config.h.cmake.in 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 198c98f..72e349c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -141,6 +141,10 @@ 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 a93fcd5..ae1d264 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@" =20 /* 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 -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1605?usp=3Demail To unsubscribe, or for help writing mail filters, visit http://gerrit.openv= pn.net/settings?usp=3Demail Gerrit-MessageType: merged Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: I3157e1a228ac7058fca6a88f94076052e33d2e01 Gerrit-Change-Number: 1605 Gerrit-PatchSet: 2 Gerrit-Owner: flichtenheld Gerrit-Reviewer: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel --oP7WbBxLIZk= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

cron2 sub= mitted this change.

View Change

build: Use info fetched from version.m4

C= hange-Id: I3157e1a228ac7058fca6a88f94076052e33d2e01
Signed-off-by: Luis = Cruz <luis.cruz@...3019...>
Acked-by: Frank Lichtenheld <frank@= ...2641...>
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1605Message-Id: <20260414125637.42082-1-frank@...2641...>
URL: https= ://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg36612.htmlSigned-off-by: Gert Doering <gert@...1296...>
---
M CMakeList= s.txt
M config.h.cmake.in
2 files changed, 7 insertions(+), 3 deletio= ns(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 198c9= 8f..72e349c 100644
--- a/CMakeLists.txt
+++= b/CMakeLists.txt
@@ -141,6 +141,10 @@
set= (OPENVPN_VERSION_PATCH ${PRODUCT_VERSION_PATCH})
set(OPENV= PN_VERSION_RESOURCE ${PRODUCT_VERSION_RESOURCE})
+set(TAP_WIN_COMPONENT_ID &qu= ot;${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= a93fcd5..ae1d264 100644
--- a/config.h.cmake.in
= +++ b/config.h.cmake.in
@@ -366,13 +366,13 @@<= br> #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-windo= ws 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 r= equired for OpenVPN */
= -#define TAP_WIN_MIN_MINOR 9
+#define TAP_WIN_MIN_MINOR @TAP_WIN_MIN_MINOR@

/* Are we running on Mac OS X? */
#cmakedef= ine TARGET_DARWIN

To view, visit change 1605. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-MessageType: merged
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I3157e1a228ac7058fca6a88f940= 76052e33d2e01
Gerrit-Change-Number: 1605
Gerrit-PatchSet: 2
Gerrit-Owner: flichtenheld <frank@...2723...= .>
Gerrit-Reviewer: flichtenheld <frank@...2716...= 1...>
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
= --oP7WbBxLIZk=--