summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2023-02-09 16:13:19 +0100
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2023-02-10 11:52:09 +0100
commitebe129654a9c5170e121c7d294310af031696c17 (patch)
tree71837d29481e1a88a9832e882bb01be1364fbe5c
parentd716a37e9d2f88e36dbbca28f636dd84dce4734f (diff)
Remove remains of qmake conversion from CMakeLists.txt files
Pick-to: 6.5 Change-Id: I17b48757cf0de6b123c96db4dfc7d227c6384071 Reviewed-by: Amir Masoud Abdol <amir.abdol@qt.io> Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
-rw-r--r--CMakeLists.txt6
-rw-r--r--src/opcua/CMakeLists.txt7
-rw-r--r--src/plugins/CMakeLists.txt2
-rw-r--r--src/plugins/opcua/CMakeLists.txt2
-rw-r--r--src/plugins/opcua/open62541/CMakeLists.txt34
-rw-r--r--src/plugins/opcua/uacpp/CMakeLists.txt5
-rw-r--r--tests/CMakeLists.txt3
-rw-r--r--tests/auto/CMakeLists.txt1
-rw-r--r--tests/auto/clientSetupInCpp/CMakeLists.txt10
-rw-r--r--tests/auto/connection/CMakeLists.txt4
-rw-r--r--tests/auto/declarative/CMakeLists.txt10
-rw-r--r--tests/auto/qopcuaclient/CMakeLists.txt7
-rw-r--r--tests/auto/security/CMakeLists.txt4
-rw-r--r--tests/auto/x509/CMakeLists.txt2
-rw-r--r--tests/manual/CMakeLists.txt2
-rw-r--r--tests/manual/gds/CMakeLists.txt1
-rw-r--r--tests/open62541-testserver/CMakeLists.txt48
-rw-r--r--tools/CMakeLists.txt2
-rw-r--r--tools/defaultnodeidsgenerator/CMakeLists.txt2
19 files changed, 12 insertions, 140 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b21b5c3..372f653 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,8 +1,6 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
-# Generated from qtopcua.pro.
-
cmake_minimum_required(VERSION 3.16)
include(.cmake.conf)
@@ -13,15 +11,11 @@ project(QtOpcUa
LANGUAGES CXX C
)
-# special case begin
find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core Network)
find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS Gui Quick QuickTest Widgets)
-# special case end
-# special case begin
# Needed for qt_opcua_disable_optimizations_in_current_dir.
include(src/opcua/Qt6OpcUaMacros.cmake)
-# special case end
if(QNX)
message(NOTICE "Skipping the build as the condition \"NOT QNX\" is not met.")
diff --git a/src/opcua/CMakeLists.txt b/src/opcua/CMakeLists.txt
index 49630a3..9975c30 100644
--- a/src/opcua/CMakeLists.txt
+++ b/src/opcua/CMakeLists.txt
@@ -1,8 +1,6 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
-# Generated from opcua.pro.
-
#####################################################################
## OpcUa Module:
#####################################################################
@@ -84,9 +82,6 @@ qt_internal_add_module(OpcUa
GENERATE_CPP_EXPORTS
)
-#### Keys ignored in scope 1:.:.:opcua.pro:<TRUE>:
-# QT_FOR_CONFIG = "core-private"
-
## Scopes:
#####################################################################
@@ -108,12 +103,10 @@ qt_internal_extend_target(OpcUa CONDITION QT_FEATURE_gds AND QT_FEATURE_ssl AND
x509/qopcuax509utils.cpp x509/qopcuax509utils_p.h
)
-# special case begin
if (QT_FEATURE_gds AND QT_FEATURE_ssl)
qt_internal_extend_target(OpcUa
LIBRARIES WrapOpenSSL::WrapOpenSSL)
endif()
-# special case end
if(MSVC)
target_compile_options(OpcUa PRIVATE /constexpr:steps3000000)
diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt
index 06edcd9..38cce6e 100644
--- a/src/plugins/CMakeLists.txt
+++ b/src/plugins/CMakeLists.txt
@@ -1,6 +1,4 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
-# Generated from plugins.pro.
-
add_subdirectory(opcua)
diff --git a/src/plugins/opcua/CMakeLists.txt b/src/plugins/opcua/CMakeLists.txt
index 5afbbe8..989fb4c 100644
--- a/src/plugins/opcua/CMakeLists.txt
+++ b/src/plugins/opcua/CMakeLists.txt
@@ -1,8 +1,6 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
-# Generated from opcua.pro.
-
if(NOT INTEGRITY AND NOT VXWORKS AND (QT_FEATURE_open62541 OR QT_FEATURE_system_open62541))
add_subdirectory(open62541)
endif()
diff --git a/src/plugins/opcua/open62541/CMakeLists.txt b/src/plugins/opcua/open62541/CMakeLists.txt
index 979ca49..2a3cae8 100644
--- a/src/plugins/opcua/open62541/CMakeLists.txt
+++ b/src/plugins/opcua/open62541/CMakeLists.txt
@@ -1,8 +1,6 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
-# Generated from open62541.pro.
-
#####################################################################
## QOpen62541Plugin Plugin:
#####################################################################
@@ -27,18 +25,13 @@ qt_internal_add_plugin(QOpen62541Plugin
Qt::OpcUaPrivate
)
-#### Keys ignored in scope 1:.:.:open62541.pro:<TRUE>:
-# OTHER_FILES = "open62541-metadata.json"
-
## Scopes:
#####################################################################
qt_internal_extend_target(QOpen62541Plugin CONDITION QT_FEATURE_open62541 AND NOT QT_FEATURE_system_open62541
SOURCES
../../../3rdparty/open62541/open62541.h
-# special case begin
../../../3rdparty/open62541/open62541.c
-# special case end
INCLUDE_DIRECTORIES
../../../3rdparty/open62541
)
@@ -47,7 +40,6 @@ set_source_files_properties(QOpen62541Plugin
qopen62541valueconverter.cpp
PROPERTIES SKIP_UNITY_BUILD_INCLUSION ON)
-# special case begin
#qt_internal_extend_target(QOpen62541Plugin CONDITION QT_FEATURE_mbedtls AND QT_FEATURE_open62541 AND NOT QT_FEATURE_system_open62541
# DEFINES
# UA_ENABLE_ENCRYPTION
@@ -57,35 +49,30 @@ set_source_files_properties(QOpen62541Plugin
#)
#special case end
-# special case begin
qt_internal_extend_target(QOpen62541Plugin CONDITION QT_FEATURE_open62541_security AND WrapOpenSSL_FOUND AND QT_FEATURE_open62541 AND NOT QT_FEATURE_system_open62541
DEFINES
UA_ENABLE_ENCRYPTION_OPENSSL
LIBRARIES
WrapOpenSSL::WrapOpenSSL
)
-# special case end
-qt_internal_extend_target(QOpen62541Plugin CONDITION QT_FEATURE_open62541 AND WIN32 AND MSVC AND NOT QT_FEATURE_system_open62541 # special case
+qt_internal_extend_target(QOpen62541Plugin CONDITION QT_FEATURE_open62541 AND WIN32 AND MSVC AND NOT QT_FEATURE_system_open62541
LIBRARIES
ws2_32.lib
)
-qt_internal_extend_target(QOpen62541Plugin CONDITION (QT_FEATURE_open62541 AND NOT QT_FEATURE_system_open62541) AND (WIN32 AND GCC) # special case
+qt_internal_extend_target(QOpen62541Plugin CONDITION (QT_FEATURE_open62541 AND NOT QT_FEATURE_system_open62541) AND (WIN32 AND GCC)
LIBRARIES
ws2_32
)
-# special case begin
#qt_internal_extend_target(QOpen62541Plugin CONDITION QT_FEATURE_open62541 AND NOT QT_FEATURE_system_open62541 AND (WINRT OR WIN32 AND MSVC)
# SOURCES
# ../../../3rdparty/open62541/open62541.c
#)
-# special case end
-# special case begin
if (QT_FEATURE_open62541 AND NOT QT_FEATURE_system_open62541)
- if (NOT (WINRT OR WIN32 AND MSVC)) # special case
+ if (NOT (WINRT OR WIN32 AND MSVC))
set_source_files_properties(../../../3rdparty/open62541/open62541.c PROPERTIES
COMPILE_OPTIONS
"-Wno-unused-parameter;-Wno-unused-function;-Wno-format;-Wno-format-security;-Wno-strict-aliasing;-Wno-unused-result;-std=c99")
@@ -98,28 +85,13 @@ if (QT_FEATURE_open62541 AND NOT QT_FEATURE_system_open62541)
COMPILE_OPTIONS "/Zc:strictStrings-;/permissive;/wd4200")
endif()
endif()
-# special case end
-
-#### Keys ignored in scope 10:.:../../../3rdparty:../../../3rdparty/open62541.pri:else:
-# OPEN62541_CFLAGS = "-Wno-unused-parameter" "-Wno-unused-function" "-Wno-format" "-Wno-strict-aliasing" "-Wno-unused-result" "-std=c99"
-# QMAKE_EXTRA_COMPILERS = "open62541_compiler"
-# open62541_compiler.commands = "$$QMAKE_CC" "-c" "$(CFLAGS)" "$$OPEN62541_CFLAGS" "$(INCPATH)" "${QMAKE_FILE_IN}" "-o" "${QMAKE_FILE_OUT}"
-# open62541_compiler.dependency_type = "TYPE_C"
-# open62541_compiler.input = "OPEN62541_SOURCES"
-# open62541_compiler.name = "compiling" "${QMAKE_FILE_IN}"
-# open62541_compiler.output = "${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${firstQMAKE_EXT_OBJ}"
-
-#### Keys ignored in scope 11:.:../../../3rdparty:../../../3rdparty/open62541.pri:silent:
-# open62541_compiler.commands = "@echo" "compiling" "${QMAKE_FILE_IN}" "&&"
qt_internal_extend_target(QOpen62541Plugin CONDITION QT_FEATURE_system_open62541 OR NOT QT_FEATURE_open62541
LIBRARIES
open62541
)
-# special case begin
#qt_internal_extend_target(QOpen62541Plugin CONDITION WIN32 AND MSVC AND (QT_FEATURE_system_open62541 OR NOT QT_FEATURE_open62541)
# PUBLIC_LIBRARIES
# open62541.lib
#)
-# special case end
diff --git a/src/plugins/opcua/uacpp/CMakeLists.txt b/src/plugins/opcua/uacpp/CMakeLists.txt
index 570a936..7d71e39 100644
--- a/src/plugins/opcua/uacpp/CMakeLists.txt
+++ b/src/plugins/opcua/uacpp/CMakeLists.txt
@@ -1,8 +1,6 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
-# Generated from uacpp.pro.
-
#####################################################################
## QUACppPlugin Plugin:
#####################################################################
@@ -27,9 +25,6 @@ qt_internal_add_plugin(QUACppPlugin
uacpp
)
-#### Keys ignored in scope 1:.:.:uacpp.pro:<TRUE>:
-# OTHER_FILES = "uacpp-metadata.json"
-
## Scopes:
#####################################################################
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 8fae2c1..77489c3 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,7 +1,6 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
-# Generated from tests.pro.
if(QT_BUILD_STANDALONE_TESTS)
# Add qt_find_package calls for extra dependencies that need to be found when building
@@ -9,8 +8,6 @@ if(QT_BUILD_STANDALONE_TESTS)
endif()
qt_build_tests()
-# special case begin
if(QT_FEATURE_open62541)
add_subdirectory(open62541-testserver)
endif()
-# special case end
diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt
index e78a86a..e43b2dc 100644
--- a/tests/auto/CMakeLists.txt
+++ b/tests/auto/CMakeLists.txt
@@ -1,7 +1,6 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
-# Generated from auto.pro.
if(NOT ANDROID)
add_subdirectory(qopcuaclient)
diff --git a/tests/auto/clientSetupInCpp/CMakeLists.txt b/tests/auto/clientSetupInCpp/CMakeLists.txt
index 870d054..e73b09e 100644
--- a/tests/auto/clientSetupInCpp/CMakeLists.txt
+++ b/tests/auto/clientSetupInCpp/CMakeLists.txt
@@ -1,8 +1,6 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
-# Generated from clientSetupInCpp.pro.
-
#####################################################################
## tst_clientSetupInCpp Test:
#####################################################################
@@ -23,20 +21,14 @@ qt_internal_add_test(tst_clientSetupInCpp
Qt::Qml
)
-#### Keys ignored in scope 1:.:.:clientSetupInCpp.pro:<TRUE>:
-# IMPORTPATH = "$$PWD/../../../src/plugins/declarative"
-# TEMPLATE = "app"
-
## Scopes:
#####################################################################
-qt_internal_extend_target(tst_clientSetupInCpp CONDITION QT_FEATURE_open62541_security # special case
+qt_internal_extend_target(tst_clientSetupInCpp CONDITION QT_FEATURE_open62541_security
DEFINES
SERVER_SUPPORTS_SECURITY
)
-# special case begin
if (WIN32)
target_compile_definitions(tst_clientSetupInCpp PRIVATE TESTS_CMAKE_SPECIFIC_PATH)
endif()
-# special case end
diff --git a/tests/auto/connection/CMakeLists.txt b/tests/auto/connection/CMakeLists.txt
index 111132a..0a40788 100644
--- a/tests/auto/connection/CMakeLists.txt
+++ b/tests/auto/connection/CMakeLists.txt
@@ -1,8 +1,6 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
-# Generated from connection.pro.
-
#####################################################################
## tst_connection Test:
#####################################################################
@@ -17,8 +15,6 @@ qt_internal_add_test(tst_connection
Qt::OpcUa
)
-# special case begin
if (WIN32)
target_compile_definitions(tst_connection PRIVATE TESTS_CMAKE_SPECIFIC_PATH)
endif()
-# special case end
diff --git a/tests/auto/declarative/CMakeLists.txt b/tests/auto/declarative/CMakeLists.txt
index 7a0d1a7..be14a1b 100644
--- a/tests/auto/declarative/CMakeLists.txt
+++ b/tests/auto/declarative/CMakeLists.txt
@@ -1,8 +1,6 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
-# Generated from declarative.pro.
-
#####################################################################
## tst_opcua Test:
#####################################################################
@@ -23,20 +21,14 @@ qt_internal_add_test(tst_opcua
Qt::Qml
)
-#### Keys ignored in scope 1:.:.:declarative.pro:<TRUE>:
-# IMPORTPATH = "$$PWD/../../../src/plugins/declarative"
-# TEMPLATE = "app"
-
## Scopes:
#####################################################################
-qt_internal_extend_target(tst_opcua CONDITION QT_FEATURE_open62541_security # special case
+qt_internal_extend_target(tst_opcua CONDITION QT_FEATURE_open62541_security
DEFINES
SERVER_SUPPORTS_SECURITY
)
-# special case begin
if (WIN32)
target_compile_definitions(tst_opcua PRIVATE TESTS_CMAKE_SPECIFIC_PATH)
endif()
-# special case end
diff --git a/tests/auto/qopcuaclient/CMakeLists.txt b/tests/auto/qopcuaclient/CMakeLists.txt
index 485b1ad..52c26d4 100644
--- a/tests/auto/qopcuaclient/CMakeLists.txt
+++ b/tests/auto/qopcuaclient/CMakeLists.txt
@@ -1,8 +1,6 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
-# Generated from qopcuaclient.pro.
-
#####################################################################
## tst_qopcuaclient Test:
#####################################################################
@@ -30,17 +28,14 @@ qt_internal_add_resource(tst_qopcuaclient "data"
${data_resource_files}
)
-
## Scopes:
#####################################################################
-qt_internal_extend_target(tst_qopcuaclient CONDITION QT_FEATURE_open62541_security AND QT_FEATURE_open62541 # special case
+qt_internal_extend_target(tst_qopcuaclient CONDITION QT_FEATURE_open62541_security AND QT_FEATURE_open62541
DEFINES
SERVER_SUPPORTS_SECURITY
)
-# special case begin
if (WIN32)
target_compile_definitions(tst_qopcuaclient PRIVATE TESTS_CMAKE_SPECIFIC_PATH)
endif()
-# special case end
diff --git a/tests/auto/security/CMakeLists.txt b/tests/auto/security/CMakeLists.txt
index 04487f2..f1a147d 100644
--- a/tests/auto/security/CMakeLists.txt
+++ b/tests/auto/security/CMakeLists.txt
@@ -1,8 +1,6 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
-# Generated from security.pro.
-
#####################################################################
## tst_security Test:
#####################################################################
@@ -35,8 +33,6 @@ qt_internal_add_resource(tst_security "certs"
${certs_resource_files}
)
-# special case begin
if (WIN32)
target_compile_definitions(tst_security PRIVATE TESTS_CMAKE_SPECIFIC_PATH)
endif()
-# special case end
diff --git a/tests/auto/x509/CMakeLists.txt b/tests/auto/x509/CMakeLists.txt
index 8fa88d4..08e85cc 100644
--- a/tests/auto/x509/CMakeLists.txt
+++ b/tests/auto/x509/CMakeLists.txt
@@ -1,8 +1,6 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
-# Generated from x509.pro.
-
#####################################################################
## tst_x509 Test:
#####################################################################
diff --git a/tests/manual/CMakeLists.txt b/tests/manual/CMakeLists.txt
index bbc2806..2ab8d91 100644
--- a/tests/manual/CMakeLists.txt
+++ b/tests/manual/CMakeLists.txt
@@ -1,8 +1,6 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
-# Generated from manual.pro.
-
if(QT_FEATURE_ssl AND NOT APPLE AND NOT WINRT)
add_subdirectory(gds)
endif()
diff --git a/tests/manual/gds/CMakeLists.txt b/tests/manual/gds/CMakeLists.txt
index 11e1474..a5538af 100644
--- a/tests/manual/gds/CMakeLists.txt
+++ b/tests/manual/gds/CMakeLists.txt
@@ -1,7 +1,6 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
-# Generated from gds.pro.
#####################################################################
## tst_gds Test:
diff --git a/tests/open62541-testserver/CMakeLists.txt b/tests/open62541-testserver/CMakeLists.txt
index e9a253c..e5a8eef 100644
--- a/tests/open62541-testserver/CMakeLists.txt
+++ b/tests/open62541-testserver/CMakeLists.txt
@@ -1,8 +1,6 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
-# Generated from open62541-testserver.pro.
-
#####################################################################
## open62541-testserver Binary:
#####################################################################
@@ -15,16 +13,14 @@ qt_internal_add_executable(open62541-testserver
testserver.cpp testserver.h
INCLUDE_DIRECTORIES
../../src/plugins/opcua/open62541
- OUTPUT_DIRECTORY # special case
- "${CMAKE_CURRENT_BINARY_DIR}" # special case
+ OUTPUT_DIRECTORY
+ "${CMAKE_CURRENT_BINARY_DIR}"
LIBRARIES
Qt::Core
Qt::OpcUaPrivate
)
-# special case begin
set_target_properties(open62541-testserver PROPERTIES MACOSX_BUNDLE TRUE)
-# special case end
# Resources:
set(certs_resource_files
@@ -41,20 +37,11 @@ qt_internal_add_resource(open62541-testserver "certs"
${certs_resource_files}
)
-
-#### Keys ignored in scope 1:.:.:open62541-testserver.pro:<TRUE>:
-# DEPENDPATH = "INCLUDEPATH"
-# QMAKE_CFLAGS_RELEASE = "--O2"
-# QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO = "--O2"
-# TEMPLATE = "app"
-
-# special case begin
# We need to disable optimizations on MSVC, to circumvent buggy code in the open62541.c file.
# Otherwise the test server fails to launch on Windows MSVC with UA_STATUSCODE_BADOUTOFMEMORY.
# We also disable them on Unixy platforms, to mimic the qmake fix done in QTBUG-75020.
# See QTBUG-85939 for details.
qt_opcua_disable_optimizations_in_current_dir()
-# special case end
## Scopes:
#####################################################################
@@ -62,12 +49,11 @@ qt_opcua_disable_optimizations_in_current_dir()
qt_internal_extend_target(open62541-testserver CONDITION QT_FEATURE_open62541 AND NOT QT_FEATURE_system_open62541
SOURCES
../../src/3rdparty/open62541/open62541.h
- ../../src/3rdparty/open62541/open62541.c # special case
+ ../../src/3rdparty/open62541/open62541.c
INCLUDE_DIRECTORIES
../../src/3rdparty/open62541
)
-# special case begin
#qt_internal_extend_target(open62541-testserver CONDITION QT_FEATURE_mbedtls AND QT_FEATURE_open62541 AND NOT QT_FEATURE_system_open62541
# DEFINES
# UA_ENABLE_ENCRYPTION
@@ -75,9 +61,7 @@ qt_internal_extend_target(open62541-testserver CONDITION QT_FEATURE_open62541 AN
# 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()
@@ -88,28 +72,24 @@ qt_internal_extend_target(open62541-testserver CONDITION QT_FEATURE_open62541_se
LIBRARIES
WrapOpenSSL::WrapOpenSSL
)
-# special case end
-qt_internal_extend_target(open62541-testserver CONDITION QT_FEATURE_open62541 AND WIN32 AND MSVC AND NOT QT_FEATURE_system_open62541 # special case
+qt_internal_extend_target(open62541-testserver CONDITION QT_FEATURE_open62541 AND WIN32 AND MSVC AND NOT QT_FEATURE_system_open62541
LIBRARIES
ws2_32.lib
)
-qt_internal_extend_target(open62541-testserver CONDITION (QT_FEATURE_open62541 AND NOT QT_FEATURE_system_open62541) AND (WIN32 AND GCC) # special case
+qt_internal_extend_target(open62541-testserver CONDITION (QT_FEATURE_open62541 AND NOT QT_FEATURE_system_open62541) AND (WIN32 AND GCC)
LIBRARIES
ws2_32
)
-# special case begin
#qt_internal_extend_target(open62541-testserver CONDITION QT_FEATURE_open62541 AND NOT QT_FEATURE_system_open62541 AND (WINRT OR WIN32 AND MSVC)
# SOURCES
# ../../src/3rdparty/open62541/open62541.c
#)
-# special case end
-# special case begin
if (QT_FEATURE_open62541 AND NOT QT_FEATURE_system_open62541)
- if (NOT (WINRT OR WIN32 AND MSVC)) # special case
+ if (NOT (WINRT OR WIN32 AND MSVC))
set_source_files_properties(../../src/3rdparty/open62541/open62541.c PROPERTIES
COMPILE_OPTIONS
"-Wno-unused-parameter;-Wno-unused-function;-Wno-format;-Wno-format-security;-Wno-strict-aliasing;-Wno-unused-result;-std=c99")
@@ -121,24 +101,8 @@ if (QT_FEATURE_open62541 AND NOT QT_FEATURE_system_open62541)
"/Zc:strictStrings-;/permissive;/wd4200")
endif()
endif()
-# special case end
-
-#### Keys ignored in scope 10:.:../../src/3rdparty:../../src/3rdparty/open62541.pri:else:
-# OPEN62541_CFLAGS = "-Wno-unused-parameter" "-Wno-unused-function" "-Wno-format" "-Wno-strict-aliasing" "-Wno-unused-result" "-std=c99"
-# QMAKE_EXTRA_COMPILERS = "open62541_compiler"
-# open62541_compiler.commands = "$$QMAKE_CC" "-c" "$(CFLAGS)" "$$OPEN62541_CFLAGS" "$(INCPATH)" "${QMAKE_FILE_IN}" "-o" "${QMAKE_FILE_OUT}"
-# open62541_compiler.dependency_type = "TYPE_C"
-# open62541_compiler.input = "OPEN62541_SOURCES"
-# open62541_compiler.name = "compiling" "${QMAKE_FILE_IN}"
-# open62541_compiler.output = "${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${firstQMAKE_EXT_OBJ}"
-
-#### Keys ignored in scope 11:.:../../src/3rdparty:../../src/3rdparty/open62541.pri:silent:
-# open62541_compiler.commands = "@echo" "compiling" "${QMAKE_FILE_IN}" "&&"
qt_internal_extend_target(open62541-testserver CONDITION QT_FEATURE_system_open62541 OR NOT QT_FEATURE_open62541
LIBRARIES
open62541
)
-
-#### Keys ignored in scope 5:.:.:open62541-testserver.pro:WIN32:
-# DESTDIR = "./"
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index cb1838e..fdd27f0 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -1,8 +1,6 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
-# Generated from tools.pro.
-
if(QT_FEATURE_ns0idgenerator)
add_subdirectory(defaultnodeidsgenerator)
endif()
diff --git a/tools/defaultnodeidsgenerator/CMakeLists.txt b/tools/defaultnodeidsgenerator/CMakeLists.txt
index a31adf5..399fe54 100644
--- a/tools/defaultnodeidsgenerator/CMakeLists.txt
+++ b/tools/defaultnodeidsgenerator/CMakeLists.txt
@@ -1,8 +1,6 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
-# Generated from defaultnodeidsgenerator.pro.
-
#####################################################################
## qtopcua-defaultnodeidsgenerator Tool:
#####################################################################