Skip to content

Commit 766252e

Browse files
committed
build: Use info fetched from version.m4
1 parent ee2af66 commit 766252e

2 files changed

Lines changed: 7 additions & 3 deletions

File tree

CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,10 @@ set(OPENVPN_VERSION_MINOR ${PRODUCT_VERSION_MINOR})
141141
set(OPENVPN_VERSION_PATCH ${PRODUCT_VERSION_PATCH})
142142
set(OPENVPN_VERSION_RESOURCE ${PRODUCT_VERSION_RESOURCE})
143143

144+
set(TAP_WIN_COMPONENT_ID "${PRODUCT_TAP_WIN_COMPONENT_ID}")
145+
set(TAP_WIN_MIN_MAJOR ${PRODUCT_TAP_WIN_MIN_MAJOR})
146+
set(TAP_WIN_MIN_MINOR ${PRODUCT_TAP_WIN_MIN_MINOR})
147+
144148
set(CMAKE_C_STANDARD 11)
145149

146150
# Set the various defines for config.h.cmake.in

config.h.cmake.in

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -366,13 +366,13 @@
366366
#undef SYSTEMD_ASK_PASSWORD_PATH
367367

368368
/* The tap-windows id */
369-
#define TAP_WIN_COMPONENT_ID "tap0901"
369+
#define TAP_WIN_COMPONENT_ID @TAP_WIN_COMPONENT_ID@
370370

371371
/* The tap-windows version number is required for OpenVPN */
372-
#define TAP_WIN_MIN_MAJOR 9
372+
#define TAP_WIN_MIN_MAJOR @TAP_WIN_MIN_MAJOR@
373373

374374
/* The tap-windows version number is required for OpenVPN */
375-
#define TAP_WIN_MIN_MINOR 9
375+
#define TAP_WIN_MIN_MINOR @TAP_WIN_MIN_MINOR@
376376

377377
/* Are we running on Mac OS X? */
378378
#cmakedefine TARGET_DARWIN

0 commit comments

Comments
 (0)