[XS] Change in openvpn[master]: Fix building wolfSSL with CMake

Attention is currently required from: flichtenheld, plaisthos.

Hello flichtenheld, 

I'd like you to reexamine a change. Please visit

    http://gerrit.openvpn.net/c/openvpn/+/1604?usp=email

to look at the new patch set (#3).

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


Change subject: Fix building wolfSSL with CMake
......................................................................

Fix building wolfSSL with CMake

Change-Id: I355760e43c3e2da0dda0cdec6e4253c028cefe38
Signed-off-by: Arne Schwabe <[email protected]>
---
M CMakeLists.txt
M config.h.cmake.in
2 files changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/04/1604/3

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 715d02c..4779d69 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -327,6 +327,7 @@
     elseif (${WOLFSSL})
         pkg_search_module(wolfssl wolfssl REQUIRED)
         target_link_libraries(${target} PUBLIC ${wolfssl_LINK_LIBRARIES})
+        target_include_directories(${target} PRIVATE ${wolfssl_INCLUDE_DIRS})
         target_include_directories(${target} PRIVATE ${wolfssl_INCLUDE_DIRS}/wolfssl)
     else ()
         find_package(OpenSSL REQUIRED)
@@ -367,6 +368,7 @@
 elseif (${WOLFSSL})
     set(ENABLE_CRYPTO_OPENSSL YES)
     set(ENABLE_CRYPTO_WOLFSSL YES)
+    set(EXTERNAL_OPTS_OPENVPN YES)
 else ()
     set(ENABLE_CRYPTO_OPENSSL YES)
 endif ()
diff --git a/config.h.cmake.in b/config.h.cmake.in
index ae1d264..34f289d 100644
--- a/config.h.cmake.in
+++ b/config.h.cmake.in
@@ -13,6 +13,7 @@
 
 /* Use wolfSSL crypto library */
 #cmakedefine ENABLE_CRYPTO_WOLFSSL
+#cmakedefine EXTERNAL_OPTS_OPENVPN
 
 /* Enable shared data channel offload */
 #cmakedefine ENABLE_DCO

-- 
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1604?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email

Gerrit-MessageType: newpatchset
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I355760e43c3e2da0dda0cdec6e4253c028cefe38
Gerrit-Change-Number: 1604
Gerrit-PatchSet: 3
Gerrit-Owner: plaisthos <[email protected]>
Gerrit-Reviewer: flichtenheld <[email protected]>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]>
Gerrit-Attention: flichtenheld <[email protected]>

_______________________________________________
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel