From: "plaisthos (Code Review)" Date: Wed, 3 Jan 2024 14:41:34 +0000 In-Reply-To: References: Reply-To: 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="YsSRYPnT8sc="; charset=UTF-8 Subject: [Openvpn-devel] [S] Change in openvpn[master]: Use mingw compile definition also to unit tests List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: flichtenheld Cc: openvpn-devel --YsSRYPnT8sc= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: flichtenheld. Hello flichtenheld,=20 I'd like you to reexamine a change. Please visit http://gerrit.openvpn.net/c/openvpn/+/469?usp=3Demail to look at the new patch set (#4). The following approvals got outdated and were removed: Code-Review-1 by flichtenheld Change subject: Use mingw compile definition also to unit tests ...................................................................... Use mingw compile definition also to unit tests Currently we only apply the defines for windows APIs and Unicode to OpenVPN itself. We should rather treat the unit tests the same as our main binary to reduce potential differences. Change-Id: Ie5aa643ab6190262f7c8b9e614bedb398e85859b Signed-off-by: Arne Schwabe --- M CMakeLists.txt 1 file changed, 8 insertions(+), 5 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/69/469/4 diff --git a/CMakeLists.txt b/CMakeLists.txt index bc46c27..6f370c3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -290,6 +290,13 @@ endif () + if (MINGW) + target_compile_definitions(${target} PRIVATE + -DWIN32_LEAN_AND_MEAN + -DNTDDI_VERSION=3DNTDDI_VISTA -D_WIN32_WINNT=3D_WIN32_WINN= T_VISTA + ) + endif() + # optional dependencies target_link_libraries(${target} PUBLIC $ @@ -545,11 +552,7 @@ add_library_deps(openvpn) -if (MINGW) - target_compile_options(openvpn PRIVATE - -DWIN32_LEAN_AND_MEAN - -DNTDDI_VERSION=3DNTDDI_VISTA -D_WIN32_WINNT=3D_WIN32_WINNT_VISTA - ) +if(MINGW) target_compile_options(openvpn PRIVATE -municode -UUNICODE) target_link_options(openvpn PRIVATE -municode) endif() -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/469?usp=3Demail To unsubscribe, or for help writing mail filters, visit http://gerrit.openv= pn.net/settings Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: Ie5aa643ab6190262f7c8b9e614bedb398e85859b Gerrit-Change-Number: 469 Gerrit-PatchSet: 4 Gerrit-Owner: plaisthos Gerrit-Reviewer: flichtenheld Gerrit-CC: openvpn-devel Gerrit-Attention: flichtenheld Gerrit-MessageType: newpatchset --YsSRYPnT8sc= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is currently required from: flichtenheld.

plaisthos uploaded patch set #4 to this change.

<= a href=3D"http://gerrit.openvpn.net/c/openvpn/+/469?usp=3Demail">View Chang= e

The following approvals got outdated and were removed: Code-Review-1 by flichtenheld

Use mingw compile definition also to unit tes=
ts

Currently we only apply the defines for windows APIs and Unicode = to
OpenVPN itself. We should rather treat the unit tests the same as
= our main binary to reduce potential differences.

Change-Id: Ie5aa643= ab6190262f7c8b9e614bedb398e85859b
Signed-off-by: Arne Schwabe <arne@...220...= ..1227...>
---
M CMakeLists.txt
1 file changed, 8 insertions(+)= , 5 deletions(-)

git pull ssh://gerrit.openvpn.net:29418/openvpn =
refs/changes/69/469/4
diff --git a/CMakeLists.txt b/CMakeLists.txt<=
/span>
index bc46c27..6f370c3 100644
--- a/CMakeLi= sts.txt
+++ b/CMakeLists.txt
@@ -290,6 +290= ,13 @@

endif ()

+ if (MINGW)<= br>+ target_compile_defi= nitions(${target} PRIVATE
+ -DWIN32_LEAN_AND_MEAN
+ -DNTDDI_VERSION=3DNTDDI_VISTA -D_WI= N32_WINNT=3D_WIN32_WINNT_VISTA
+ )
= + endif()
+=
# optional dependencies
target_link_lib= raries(${target} PUBLIC
$<TARGET_NAME_IF_EXISTS= :PkgConfig::liblz4>
@@ -545,11 +552,7 @@

add_library_deps(openvpn)

<= span style=3D"color: hsl(0, 100%, 40%);">-if (MINGW)

- target_compile_options(openvpn PRIVATE<= /span>
- -DWIN32_LEAN_A= ND_MEAN
- -DNTDD= I_VERSION=3DNTDDI_VISTA -D_WIN32_WINNT=3D_WIN32_WINNT_VISTA
- )

+if(MINGW)
target_compile_o= ptions(openvpn PRIVATE -municode -UUNICODE)
target_lin= k_options(openvpn PRIVATE -municode)
endif()

To view, visit change 469. To unsubscribe, or for help wr= iting mail filters, visit se= ttings.

<= div itemscope itemprop=3D"action" itemtype=3D"http://schema.org/ViewAction"= >
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ie5aa643ab6190262f7c8b9e614b= edb398e85859b
Gerrit-Change-Number: 469
Gerrit-PatchSet: 4
Gerrit-Owner: plaisthos <arne-openvpn@...1711...= 27...>
Gerrit-Reviewer: flichtenheld <frank@...2716...= 1...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-Attention: flichtenheld <frank@...2375...= 41...>
Gerrit-MessageType: newpatchset
--YsSRYPnT8sc=--