qiurui
/
qtcoap
mirror of https://github.com/qt/qtcoap.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove remains of qmake conversion from CMakeLists.txt files 

Pick-to: 6.5
Change-Id: I50610fc5d680151b0092adb128f8a604125792d5
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
This commit is contained in:
Friedemann Kleint 2023-02-09 16:19:43 +01:00
parent 73cd6d8b3c
commit 2db1f76335
14 changed files with 2 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -1,8 +1,6 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
# Generated from qtcoap.pro.
cmake_minimum_required(VERSION 3.16)
include(.cmake.conf)
@ -10,7 +8,7 @@ project(QtCoap
VERSION "${QT_REPO_MODULE_VERSION}"
DESCRIPTION "Qt Coap Libraries"
HOMEPAGE_URL "https://qt.io/"
LANGUAGES CXX # special case
LANGUAGES CXX
)
find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core Network)

2
src/CMakeLists.txt
View File

@ -1,6 +1,4 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
# Generated from src.pro.
add_subdirectory(coap)

2
src/coap/CMakeLists.txt
View File

@ -1,8 +1,6 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
# Generated from coap.pro.
#####################################################################
## Coap Module:
#####################################################################

2
tests/CMakeLists.txt
View File

@ -1,8 +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
# the standalone tests here.

5
tests/auto/CMakeLists.txt
View File

@ -1,11 +1,6 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
# Generated from auto.pro.
# special case begin
# add_subdirectory(cmake)
# sepcial case end
add_subdirectory(qcoapclient)
add_subdirectory(qcoapmessage)
add_subdirectory(qcoapoption)

9
tests/auto/qcoapclient/CMakeLists.txt
View File

@ -1,8 +1,6 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
# Generated from qcoapclient.pro.
#####################################################################
## qcoapclient Test:
#####################################################################
@ -10,7 +8,7 @@
set (QT_TESTSERVER_COMPOSE_FILE "${CMAKE_CURRENT_SOURCE_DIR}/../../testserver/docker-compose.yml")
qt_internal_add_test(qcoapclient
EXCEPTIONS # special case
EXCEPTIONS
GUI
SOURCES
../coapnetworksettings.h
@ -22,15 +20,10 @@ qt_internal_add_test(qcoapclient
QT_TEST_SERVER_LIST "californium" "freecoap"
)
#### Keys ignored in scope 1:.:.:qcoapclient.pro:<TRUE>:
# QT_TEST_SERVER_LIST = "californium" "freecoap"
## Scopes:
#####################################################################
# special case begin
qt_internal_extend_target(qcoapclient CONDITION DEFINED ENV{COAP_TEST_SERVER_IP}
DEFINES
COAP_TEST_SERVER_IP="$ENV{COAP_TEST_SERVER_IP}"
)
# special case end

2
tests/auto/qcoapinternalreply/CMakeLists.txt
View File

@ -1,8 +1,6 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
# Generated from qcoapinternalreply.pro.
#####################################################################
## qcoapinternalreply Test:
#####################################################################

2
tests/auto/qcoapinternalrequest/CMakeLists.txt
View File

@ -1,8 +1,6 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
# Generated from qcoapinternalrequest.pro.
#####################################################################
## qcoapinternalrequest Test:
#####################################################################

2
tests/auto/qcoapmessage/CMakeLists.txt
View File

@ -1,8 +1,6 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
# Generated from qcoapmessage.pro.
#####################################################################
## qcoapmessage Test:
#####################################################################

2
tests/auto/qcoapoption/CMakeLists.txt
View File

@ -1,8 +1,6 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
# Generated from qcoapoption.pro.
#####################################################################
## qcoapoption Test:
#####################################################################

7
tests/auto/qcoapqudpconnection/CMakeLists.txt
View File

@ -1,8 +1,6 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
# Generated from qcoapqudpconnection.pro.
#####################################################################
## qcoapqudpconnection Test:
#####################################################################
@ -20,15 +18,10 @@ qt_internal_add_test(qcoapqudpconnection
QT_TEST_SERVER_LIST "californium"
)
#### Keys ignored in scope 1:.:.:qcoapqudpconnection.pro:<TRUE>:
# QT_TEST_SERVER_LIST = "californium"
## Scopes:
#####################################################################
# special case begin
qt_internal_extend_target(qcoapqudpconnection CONDITION DEFINED ENV{COAP_TEST_SERVER_IP}
DEFINES
COAP_TEST_SERVER_IP="$ENV{COAP_TEST_SERVER_IP}"
)
# special case end

2
tests/auto/qcoapreply/CMakeLists.txt
View File

@ -1,8 +1,6 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
# Generated from qcoapreply.pro.
#####################################################################
## qcoapreply Test:
#####################################################################

2
tests/auto/qcoaprequest/CMakeLists.txt
View File

@ -1,8 +1,6 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
# Generated from qcoaprequest.pro.
#####################################################################
## qcoaprequest Test:
#####################################################################

2
tests/auto/qcoapresource/CMakeLists.txt
View File

@ -1,8 +1,6 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
# Generated from qcoapresource.pro.
#####################################################################
## qcoapresource Test:
#####################################################################