diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/clientSetupInCpp/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/auto/declarative/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/auto/qopcuaclient/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/auto/security/pki/trusted/certs/open62541-testserver.der | bin | 1127 -> 1161 bytes | |||
| -rw-r--r-- | tests/open62541-testserver/CMakeLists.txt | 22 | ||||
| -rw-r--r-- | tests/open62541-testserver/pki/own/certs/open62541-testserver.der | bin | 1127 -> 1161 bytes | |||
| -rw-r--r-- | tests/open62541-testserver/pki/own/private/open62541-testserver.der | bin | 1216 -> 1675 bytes | |||
| -rw-r--r-- | tests/open62541-testserver/pki/trusted/certs/opcuaviewer.der | bin | 1121 -> 1610 bytes |
8 files changed, 22 insertions, 6 deletions
diff --git a/tests/auto/clientSetupInCpp/CMakeLists.txt b/tests/auto/clientSetupInCpp/CMakeLists.txt index 5fa034e..6a58c4e 100644 --- a/tests/auto/clientSetupInCpp/CMakeLists.txt +++ b/tests/auto/clientSetupInCpp/CMakeLists.txt @@ -27,7 +27,7 @@ qt_add_test(tst_clientSetupInCpp ## Scopes: ##################################################################### -qt_extend_target(tst_clientSetupInCpp CONDITION QT_FEATURE_mbedtls +qt_extend_target(tst_clientSetupInCpp CONDITION QT_FEATURE_open62541_security # special case DEFINES SERVER_SUPPORTS_SECURITY ) diff --git a/tests/auto/declarative/CMakeLists.txt b/tests/auto/declarative/CMakeLists.txt index 40ade46..0818bfb 100644 --- a/tests/auto/declarative/CMakeLists.txt +++ b/tests/auto/declarative/CMakeLists.txt @@ -27,7 +27,7 @@ qt_add_test(tst_opcua ## Scopes: ##################################################################### -qt_extend_target(tst_opcua CONDITION QT_FEATURE_mbedtls +qt_extend_target(tst_opcua CONDITION QT_FEATURE_open62541_security # special case DEFINES SERVER_SUPPORTS_SECURITY ) diff --git a/tests/auto/qopcuaclient/CMakeLists.txt b/tests/auto/qopcuaclient/CMakeLists.txt index 768d4f3..a098ffc 100644 --- a/tests/auto/qopcuaclient/CMakeLists.txt +++ b/tests/auto/qopcuaclient/CMakeLists.txt @@ -31,7 +31,7 @@ qt_add_resource(tst_qopcuaclient "data" ## Scopes: ##################################################################### -qt_extend_target(tst_qopcuaclient CONDITION QT_FEATURE_mbedtls +qt_extend_target(tst_qopcuaclient CONDITION QT_FEATURE_open62541_security AND QT_FEATURE_open62541 # special case DEFINES SERVER_SUPPORTS_SECURITY ) diff --git a/tests/auto/security/pki/trusted/certs/open62541-testserver.der b/tests/auto/security/pki/trusted/certs/open62541-testserver.der Binary files differindex 0bead45..e32d2c3 100644 --- a/tests/auto/security/pki/trusted/certs/open62541-testserver.der +++ b/tests/auto/security/pki/trusted/certs/open62541-testserver.der diff --git a/tests/open62541-testserver/CMakeLists.txt b/tests/open62541-testserver/CMakeLists.txt index 61e98bb..c137acb 100644 --- a/tests/open62541-testserver/CMakeLists.txt +++ b/tests/open62541-testserver/CMakeLists.txt @@ -64,13 +64,29 @@ qt_extend_target(open62541-testserver CONDITION QT_FEATURE_open62541 AND NOT QT_ ../../src/3rdparty/open62541 ) -qt_extend_target(open62541-testserver CONDITION QT_FEATURE_mbedtls AND QT_FEATURE_open62541 AND NOT QT_FEATURE_system_open62541 +# special case begin +#qt_extend_target(open62541-testserver CONDITION QT_FEATURE_mbedtls AND QT_FEATURE_open62541 AND NOT QT_FEATURE_system_open62541 +# DEFINES +# UA_ENABLE_ENCRYPTION +# UA_ENABLE_ENCRYPTION_MBEDTLS +# LIBRARIES +# mbedtls +#) +# special case end + +# special case begin +if (QT_FEATURE_open62541_security AND NOT QT_FEATURE_system_open62541) + find_package(WrapOpenSSL 1.1) +endif() + +qt_extend_target(open62541-testserver CONDITION QT_FEATURE_open62541_security AND WrapOpenSSL_FOUND AND QT_FEATURE_open62541 AND NOT QT_FEATURE_system_open62541 DEFINES UA_ENABLE_ENCRYPTION - UA_ENABLE_ENCRYPTION_MBEDTLS + UA_ENABLE_ENCRYPTION_OPENSSL LIBRARIES - mbedtls + WrapOpenSSL::WrapOpenSSL ) +# special case end qt_extend_target(open62541-testserver CONDITION QT_FEATURE_open62541 AND WIN32 AND MSVC AND NOT QT_FEATURE_system_open62541 # special case PUBLIC_LIBRARIES diff --git a/tests/open62541-testserver/pki/own/certs/open62541-testserver.der b/tests/open62541-testserver/pki/own/certs/open62541-testserver.der Binary files differindex 0bead45..e32d2c3 100644 --- a/tests/open62541-testserver/pki/own/certs/open62541-testserver.der +++ b/tests/open62541-testserver/pki/own/certs/open62541-testserver.der diff --git a/tests/open62541-testserver/pki/own/private/open62541-testserver.der b/tests/open62541-testserver/pki/own/private/open62541-testserver.der Binary files differindex 4c6f6e2..56fb177 100644 --- a/tests/open62541-testserver/pki/own/private/open62541-testserver.der +++ b/tests/open62541-testserver/pki/own/private/open62541-testserver.der diff --git a/tests/open62541-testserver/pki/trusted/certs/opcuaviewer.der b/tests/open62541-testserver/pki/trusted/certs/opcuaviewer.der Binary files differindex ef7ef42..638b3b9 100644 --- a/tests/open62541-testserver/pki/trusted/certs/opcuaviewer.der +++ b/tests/open62541-testserver/pki/trusted/certs/opcuaviewer.der |