[Openvpn-devel,OpenVPN3,2/2] omi: add support for ovpn-dco-win

Message ID 20220607163049.10056-2-facboy@gmail.com
State Accepted, archived
Delegated to: David Sommerseth
Headers show
Series [Openvpn-devel,OpenVPN3,1/2] ovpnagent: fix quoting of omiclient parameters | expand

Commit Message

Christopher Ng June 7, 2022, 6:30 a.m. UTC
Signed-off-by: Christopher Ng <facboy@gmail.com>
---
 openvpn/omi/CMakeLists.txt | 9 +++++++++
 1 file changed, 9 insertions(+)

Comments

Lev Stipakov June 7, 2022, 8:37 p.m. UTC | #1
As discussed at https://github.com/OpenVPN/openvpn3/pull/218

Acked-by: Lev Stipakov <lstipakov@gmail.com>

ti 7. kesäk. 2022 klo 20.26 Christopher Ng (facboy@gmail.com) kirjoitti:

> Signed-off-by: Christopher Ng <facboy@gmail.com>
> ---
>  openvpn/omi/CMakeLists.txt | 9 +++++++++
>  1 file changed, 9 insertions(+)
>
> diff --git a/openvpn/omi/CMakeLists.txt b/openvpn/omi/CMakeLists.txt
> index d773da39..cd7cb8fd 100644
> --- a/openvpn/omi/CMakeLists.txt
> +++ b/openvpn/omi/CMakeLists.txt
> @@ -1,3 +1,5 @@
> +option(CLI_OVPNDCOWIN "Build ovpncli with ovpn-dco-win driver support"
> OFF)
> +
>  add_executable(omicliagent openvpn.cpp)
>  add_core_dependencies(omicliagent)
>  add_json_library(omicliagent)
> @@ -5,3 +7,10 @@ target_compile_definitions(omicliagent PRIVATE
> -DOPENVPN_COMMAND_AGENT -DOVPNAGE
>
>  add_executable(omicli openvpn.cpp)
>  add_core_dependencies(omicli)
> +
> +if (WIN32 AND ${CLI_OVPNDCOWIN})
> +    target_compile_definitions(omicliagent PRIVATE ENABLE_OVPNDCOWIN)
> +    target_compile_definitions(omicli PRIVATE ENABLE_OVPNDCOWIN)
> +    target_link_libraries(omicliagent "bcrypt.lib")
> +    target_link_libraries(omicli "bcrypt.lib")
> +endif ()
> --
> 2.34.1
>
>
>
> _______________________________________________
> Openvpn-devel mailing list
> Openvpn-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/openvpn-devel
>
David Sommerseth June 8, 2022, 1:55 p.m. UTC | #2
From: David Sommerseth <davids@openvpn.net>

Your patch has been applied to the master branch

commit 94848c3cc3f5ea1fec97ab6b18ba7eff6923561d master
Author: Christopher Ng
Date:   Tue, 07 Jun 2022 16:30:49 +0000

     omi: add support for ovpn-dco-win

     Signed-off-by: Christopher Ng
     Acked-by: Lev Stipakov
     Patchwork-Id: 2509
     URL: https://patchwork.openvpn.net/patch/2509/
     Message-Id: <20220607163049.10056-2-facboy@gmail.com>
     Signed-off-by: David Sommerseth


--
kind regards,

David Sommerseth

Patch

diff --git a/openvpn/omi/CMakeLists.txt b/openvpn/omi/CMakeLists.txt
index d773da39..cd7cb8fd 100644
--- a/openvpn/omi/CMakeLists.txt
+++ b/openvpn/omi/CMakeLists.txt
@@ -1,3 +1,5 @@ 
+option(CLI_OVPNDCOWIN "Build ovpncli with ovpn-dco-win driver support" OFF)
+
 add_executable(omicliagent openvpn.cpp)
 add_core_dependencies(omicliagent)
 add_json_library(omicliagent)
@@ -5,3 +7,10 @@  target_compile_definitions(omicliagent PRIVATE -DOPENVPN_COMMAND_AGENT -DOVPNAGE
 
 add_executable(omicli openvpn.cpp)
 add_core_dependencies(omicli)
+
+if (WIN32 AND ${CLI_OVPNDCOWIN})
+    target_compile_definitions(omicliagent PRIVATE ENABLE_OVPNDCOWIN)
+    target_compile_definitions(omicli PRIVATE ENABLE_OVPNDCOWIN)
+    target_link_libraries(omicliagent "bcrypt.lib")
+    target_link_libraries(omicli "bcrypt.lib")
+endif ()