From: "cron2 (Code Review)" Date: Tue, 16 Jan 2024 13:23:19 +0000 In-Reply-To: References: Reply-To: gert@...1296..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641... Message-ID: <26585db60e6d7c84d7e4a6312927a8fdc35b60b8-EmailReplacePatchSet-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="HM3xcksQomg="; 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: plaisthos , flichtenheld Cc: openvpn-devel --HM3xcksQomg= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable cron2 has uploaded a new patch set (#5) to the change originally created by= plaisthos. ( http://gerrit.openvpn.net/c/openvpn/+/469?usp=3Demail ) The following approvals got outdated and were removed: Code-Review+2 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 Acked-by: Frank Lichtenheld Message-Id: <20240116131831.31217-1-gert@...1296...> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg28= 019.html Signed-off-by: Gert Doering --- M CMakeLists.txt 1 file changed, 8 insertions(+), 5 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/69/469/5 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: 5 Gerrit-Owner: plaisthos Gerrit-Reviewer: flichtenheld Gerrit-CC: openvpn-devel Gerrit-MessageType: newpatchset --HM3xcksQomg= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

cron2 uploaded patch set #5 to the change originally cr= eated by plaisthos.

View Change

The following approvals got outdated= and were removed: Code-Review+2 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...>
Acked-by: Frank Lichtenheld <frank@...2641...>
Me= ssage-Id: <20240116131831.31217-1-gert@...1296...>
URL: https://ww= w.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg28019.html
Sig= ned-off-by: Gert Doering <gert@...1296...>
---
M CMakeLists.txt=
1 file changed, 8 insertions(+), 5 deletions(-)

git pull ssh:=
//gerrit.openvpn.net:29418/openvpn refs/changes/69/469/5
diff --git=
 a/CMakeLists.txt b/CMakeLists.txt
index bc46c27..6f370c3 1= 00644
--- a/CMakeLists.txt
+++ b/CMakeLists= .txt
@@ -290,6 +290,13 @@

endif ()

+ if (MINGW)
+ target_compile_definitions(${target} PRIVATE
+ -DWIN32_LEAN_AND_M= EAN
+ = -DNTDDI_VERSION=3DNTDDI_VISTA -D_WIN32_WINNT=3D_WIN32_WINNT_VISTA+ )
+ endif()
+
# optional dependencies
target_link_libraries(${target} PUBLIC
= $<TARGET_NAME_IF_EXISTS:PkgConfig::liblz4>
@= @ -545,11 +552,7 @@

add_library_deps(ope= nvpn)

-if (MINGW)
- targe= t_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 -UUNICOD= E)
target_link_options(openvpn PRIVATE -municode)

endif()

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

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ie5aa643ab6190262f7c8b9e614b= edb398e85859b
Gerrit-Change-Number: 469
Gerrit-PatchSet: 5
Gerrit-Owner: plaisthos <arne-openvpn@...1711...= 27...>
Gerrit-Reviewer: flichtenheld <frank@...2716...= 1...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-MessageType: newpatchset
--HM3xcksQomg=--