From d76d42630209869a5b4bac8cb375286632635690 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Wed, 16 Jun 2021 11:18:35 +0200 Subject: Remove old configure-related files Remove the configure.json and configure.pri files that were used for the qmake-based configure. Remove the .prev_*.cmake files that were a by-product of configurejson2cmake.py. Pick-to: 6.2 Task-number: QTBUG-89536 Change-Id: Ia9b0ed4dd8108d5a43cb5b6e878ac003d2d54f10 Reviewed-by: Alexandru Croitor --- configure.json | 5 -- src/opcua/.prev_configure.cmake | 60 --------------------- src/opcua/configure.json | 112 ---------------------------------------- src/opcua/configure.pri | 44 ---------------- 4 files changed, 221 deletions(-) delete mode 100644 configure.json delete mode 100644 src/opcua/.prev_configure.cmake delete mode 100644 src/opcua/configure.json delete mode 100644 src/opcua/configure.pri diff --git a/configure.json b/configure.json deleted file mode 100644 index 59e663e..0000000 --- a/configure.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "subconfigs": [ - "src/opcua" - ] -} diff --git a/src/opcua/.prev_configure.cmake b/src/opcua/.prev_configure.cmake deleted file mode 100644 index 475c1a3..0000000 --- a/src/opcua/.prev_configure.cmake +++ /dev/null @@ -1,60 +0,0 @@ - - -#### Inputs - -# input open62541 -set(INPUT_open62541 "undefined" CACHE STRING "") -set_property(CACHE INPUT_open62541 PROPERTY STRINGS undefined no qt system) - - - -#### Libraries - - - -#### Tests - - - -#### Features - -qt_feature("open62541" PUBLIC PRIVATE - LABEL "Open62541" -) -qt_feature_definition("open62541" "QT_NO_OPEN62541" NEGATE VALUE "1") -qt_feature("system-open62541" PRIVATE - LABEL "Using provided Open62541" - CONDITION QT_FEATURE_open62541 AND libs.open62541 OR FIXME - ENABLE INPUT_open62541 STREQUAL 'system' - DISABLE INPUT_open62541 STREQUAL 'qt' -) -qt_feature("uacpp" PRIVATE - LABEL "Unified Automation C++ SDK" - CONDITION libs.uacpp OR FIXME -) -qt_feature("mbedtls" PRIVATE - LABEL "mbedtls" - CONDITION libs.mbedtls OR FIXME -) -qt_feature("ns0idnames" PRIVATE - LABEL "Support for namespace 0 NodeId names" - PURPOSE "Provides names for the QOpcUa::NodeIds::Namespace0 enum." -) -qt_feature("ns0idgenerator" PRIVATE - LABEL "Namespace 0 NodeIds generator" - PURPOSE "Build a generator for updating the QOpcUa::NodeIds::Namespace0 enum from the NodeIds.csv file." - AUTODETECT false -) -qt_feature("gds" PUBLIC PRIVATE - LABEL "Support for global discovery server" - PURPOSE "Enables QOpcUaClient to interact with a global discovery server" -) -qt_feature_definition("gds" "QT_NO_GDS" NEGATE VALUE "1") -qt_configure_add_summary_section(NAME "Qt Opcua") -qt_configure_add_summary_entry(ARGS "open62541") -qt_configure_add_summary_entry(ARGS "uacpp") -qt_configure_add_summary_entry(ARGS "ns0idnames") -qt_configure_add_summary_entry(ARGS "ns0idgenerator") -qt_configure_add_summary_entry(ARGS "mbedtls") -qt_configure_add_summary_entry(ARGS "gds") -qt_configure_end_summary_section() # end of "Qt Opcua" section diff --git a/src/opcua/configure.json b/src/opcua/configure.json deleted file mode 100644 index a87948d..0000000 --- a/src/opcua/configure.json +++ /dev/null @@ -1,112 +0,0 @@ -{ - "module": "opcua", - "testDir": "../../config.tests", - - "commandline": { - "options": { - "open62541": { "type": "enum", "values": [ "no", "qt", "system"] } - } - }, - - "libraries": { - "open62541": { - "label": "Open62541", - "test": "open62541", - "sources": [ - { - "libs": "-lopen62541", - "condition": "!config.win32 && input.open62541 == 'system'" - }, - { - "libs": "-lopen62541 -lws2_32", - "condition": "config.win32 && input.open62541 == 'system'" - }, - { - "type": "pkgConfig", - "args": "open62541", - "condition": "input.open62541 == 'system'" - } - ] - }, - "uacpp": { - "label": "Unified Automation C++ SDK", - "test": "uacpp", - "sources": [ - { - "type": "uacpp", - "builds": { - "debug": "-luaclientcppd -luabasecppd -luastackd -luapkicppd -lxmlparsercppd", - "release": " -luaclientcpp -luabasecpp -luastack -luapkicpp -lxmlparsercpp" - }, - "libs": "-lCrypt32 -lOle32 -lOleAut32 -lws2_32 -llibeay32 -llibxml2", - "condition": "config.win32" - }, - { - "type": "uacpp", - "builds": { - "debug": "-luaclientcppd -luabasecppd -luastackd -luapkicppd -lxmlparsercppd", - "release": "-luaclientcpp -luabasecpp -luastack -luapkicpp -lxmlparsercpp" - }, - "libs": "-lcrypto -lssl -lxml2", - "condition": "!config.win32" - } - ] - }, - "mbedtls": { - "label": "mbedtls", - "test": "mbedtls", - "sources": [ - { - "libs": "-lmbedx509 -lmbedcrypto" - } - ] - } - }, - - "features": { - "open62541": { - "label": "Open62541", - "output": [ "privateFeature", "feature" ] - }, - "system-open62541": { - "label": "Using provided Open62541", - "enable": "input.open62541 == 'system'", - "disable": "input.open62541 == 'qt'", - "condition": "features.open62541 && libs.open62541", - "output": [ "privateFeature" ] - }, - "uacpp": { - "label": "Unified Automation C++ SDK", - "condition": "libs.uacpp", - "output": [ "privateFeature" ] - }, - "mbedtls": { - "label": "mbedtls", - "condition": "libs.mbedtls", - "output": [ "privateFeature" ] - }, - "ns0idnames": { - "label": "Support for namespace 0 NodeId names", - "purpose": "Provides names for the QOpcUa::NodeIds::Namespace0 enum.", - "output": [ "privateFeature" ] - }, - "ns0idgenerator": { - "label": "Namespace 0 NodeIds generator", - "purpose": "Build a generator for updating the QOpcUa::NodeIds::Namespace0 enum from the NodeIds.csv file.", - "autoDetect": "false", - "output": [ "privateFeature" ] - }, - "gds": { - "label": "Support for global discovery server", - "purpose": "Enables QOpcUaClient to interact with a global discovery server", - "output": [ "privateFeature", "feature" ] - } - }, - - "summary": [ - { - "section": "Qt Opcua", - "entries": [ "open62541", "uacpp", "ns0idnames", "ns0idgenerator", "mbedtls", "gds" ] - } - ] -} diff --git a/src/opcua/configure.pri b/src/opcua/configure.pri deleted file mode 100644 index 4c47996..0000000 --- a/src/opcua/configure.pri +++ /dev/null @@ -1,44 +0,0 @@ -defineTest(qtConfLibrary_uacpp) { - input = $$eval($${2}.alias) - prefix = $$eval(config.input.$${input}.prefix) - - inc = $$eval(config.input.$${input}.incdir) - isEmpty(inc):!isEmpty(prefix): \ - inc = $${prefix}/include - libdir = $$eval(config.input.$${input}.libdir) - isEmpty(libdir):!isEmpty(prefix): \ - libdir = $${prefix}/lib - config.input.$${input}.libdir = $$libdir - !isEmpty(inc) { - config.input.$${input}.incdir += \ - $$inc/uabasecpp $$inc/uaclientcpp $$inc/uastack $$inc/uapkicpp - } else { - qtLog("No UACPP_PREFIX and no UACPP_INCDIR specified; relying on global include paths.") - } - - # The Windows SDK ships its dependencies and locates the libraries outside of lib - win32 { - lessThan(QMAKE_MSC_VER, 1900) { - qtLog("UaCpp SDK requires at least Visual Studio 2015") - return(false) - } - - !isEmpty(prefix) { - contains(QMAKE_TARGET.arch, x86_64): archdir = win64 - else: archdir = win32 - - config.input.$${input}.incdir += \ - $${prefix}/third-party/$${archdir}/vs2015/openssl/inc32 - - config.input.$${input}.libdir += \ - $${prefix}/third-party/$${archdir}/vs2015/openssl/out32dll \ - $${prefix}/third-party/$${archdir}/vs2015/libxml2/out32dll - } else { - qtLog("No UACPP_PREFIX specified; relying on user-provided library path.") - } - } - - !qtConfLibrary_inline($$1, $$2): \ - return(false) - return(true) -} -- cgit v1.2.3