diff options
| author | Jannis Voelker <jannis.voelker@basyskom.com> | 2020-08-24 14:10:14 +0200 |
|---|---|---|
| committer | Jannis Voelker <jannis.voelker@basyskom.com> | 2020-08-24 14:38:05 +0200 |
| commit | 50d01102af91b5c193116fb57c93cf032b3439f8 (patch) | |
| tree | 461c448afc13bebe588cc4b9ed39be9bd617e049 | |
| parent | 73b9de5324d86098ec814f63a0969cfad9e64e43 (diff) | |
Fix auto.pro and regenerate CMake files
Change-Id: I10c894f6c559f004ce219a43f283c5881e7987b8
Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
| -rw-r--r-- | src/plugins/opcua/open62541/.prev_CMakeLists.txt | 1 | ||||
| -rw-r--r-- | tests/auto/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/auto/auto.pro | 6 | ||||
| -rw-r--r-- | tests/manual/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | tests/open62541-testserver/.prev_CMakeLists.txt | 1 |
5 files changed, 7 insertions, 4 deletions
diff --git a/src/plugins/opcua/open62541/.prev_CMakeLists.txt b/src/plugins/opcua/open62541/.prev_CMakeLists.txt index 253be64..9dfbf8f 100644 --- a/src/plugins/opcua/open62541/.prev_CMakeLists.txt +++ b/src/plugins/opcua/open62541/.prev_CMakeLists.txt @@ -40,6 +40,7 @@ qt_extend_target(QOpen62541Plugin CONDITION QT_FEATURE_open62541 AND NOT QT_FEAT qt_extend_target(QOpen62541Plugin CONDITION QT_FEATURE_mbedtls AND QT_FEATURE_open62541 AND NOT QT_FEATURE_system_open62541 DEFINES UA_ENABLE_ENCRYPTION + UA_ENABLE_ENCRYPTION_MBEDTLS LIBRARIES mbedtls ) diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt index 33e357f..89039e1 100644 --- a/tests/auto/CMakeLists.txt +++ b/tests/auto/CMakeLists.txt @@ -3,7 +3,7 @@ add_subdirectory(qopcuaclient) add_subdirectory(connection) add_subdirectory(security) -if((QT_FEATURE_uacpp OR QT_FEATURE_open62541) AND TARGET Qt::QuickTest) +if(TARGET Qt::QuickTest AND (QT_FEATURE_open62541 OR QT_FEATURE_uacpp)) add_subdirectory(declarative) add_subdirectory(clientSetupInCpp) endif() diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index fe07e68..c1ec3fb 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -4,8 +4,10 @@ SUBDIRS += qopcuaclient connection security QT_FOR_CONFIG += opcua-private core-private # only build declarative tests if at least one backend was built -qtHaveModule(qmltest):qtConfig(open62541)|qtConfig(uacpp) { - SUBDIRS += declarative clientSetupInCpp +qtHaveModule(qmltest) { + qtConfig(open62541)|qtConfig(uacpp) { + SUBDIRS += declarative clientSetupInCpp + } } qtConfig(gds) { diff --git a/tests/manual/CMakeLists.txt b/tests/manual/CMakeLists.txt index 43b3f3e..a6e72b9 100644 --- a/tests/manual/CMakeLists.txt +++ b/tests/manual/CMakeLists.txt @@ -1,6 +1,5 @@ # Generated from manual.pro. -add_subdirectory(eventsubscription) if(QT_FEATURE_ssl AND NOT APPLE AND NOT WINRT) add_subdirectory(gds) endif() diff --git a/tests/open62541-testserver/.prev_CMakeLists.txt b/tests/open62541-testserver/.prev_CMakeLists.txt index 766bb8f..9aba4c3 100644 --- a/tests/open62541-testserver/.prev_CMakeLists.txt +++ b/tests/open62541-testserver/.prev_CMakeLists.txt @@ -52,6 +52,7 @@ qt_extend_target(open62541-testserver CONDITION QT_FEATURE_open62541 AND NOT QT_ 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 ) |