From: "flichtenheld (Code Review)" Date: Thu, 2 Apr 2026 14:06:58 +0000 References: Reply-To: frank@...2641..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net Message-ID: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="d6ZYMNF7Gm0="; 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: plaisthos Cc: openvpn-devel --d6ZYMNF7Gm0= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: plaisthos. Hello plaisthos, I'd like you to do a code review. Please visit http://gerrit.openvpn.net/c/openvpn/+/1605?usp=3Demail to review the following change. Change subject: build: Use info fetched from version.m4 ...................................................................... build: Use info fetched from version.m4 Change-Id: I3157e1a228ac7058fca6a88f94076052e33d2e01 Signed-off-by: Luis Cruz --- M CMakeLists.txt M config.h.cmake.in 2 files changed, 7 insertions(+), 3 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/05/1605/1 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@" /* 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: newchange Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: I3157e1a228ac7058fca6a88f94076052e33d2e01 Gerrit-Change-Number: 1605 Gerrit-PatchSet: 1 Gerrit-Owner: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-Attention: plaisthos --d6ZYMNF7Gm0= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is cur= rently required from: plaisthos.

flichtenheld would like plaisthos to review this change.

V= iew Change

build: Use info fetched from version.m4
=
Change-Id: I3157e1a228ac7058fca6a88f94076052e33d2e01
Signed-off-by: = Luis Cruz <luis.cruz@...3019...>
---
M CMakeLists.txt
M conf= ig.h.cmake.in
2 files changed, 7 insertions(+), 3 deletions(-)

git pull ssh://gerrit.openvpn.net:29418/openvpn refs/chan=
ges/05/1605/1
diff --git a/CMakeLists.txt b/CMakeLists.txtindex 198c98f..72e349c 100644
--- a/CMakeLists.txt<= /span>
+++ b/CMakeLists.txt
@@ -141,6 +141,10 @@
set(OPENVPN_VERSION_PATCH ${PRODUCT_VERSION_PATCH})<= br> set(OPENVPN_VERSION_RESOURCE ${PRODUCT_VERSION_RESOURCE})<= br>
+set(TAP_W= IN_COMPONENT_ID "${PRODUCT_TAP_WIN_COMPONENT_ID}")
+set(TAP_WIN_MIN_MAJOR ${PRODUCT_TA= P_WIN_MIN_MAJOR})

+se= t(TAP_WIN_MIN_MINOR ${PRODUCT_TAP_WIN_MIN_MINOR})
+
set(CMAKE_C_STANDARD 11)

# Set the various defines for config.h.cma= ke.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_COMPO= NENT_ID "@TAP_WIN_COMPONENT_ID@"

/* The tap-windows version number is required for OpenVPN */

<= span style=3D"color: hsl(0, 100%, 40%);">-#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? */<= br> #cmakedefine TARGET_DARWIN

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

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