diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-01-31 11:43:22 +0100 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@qt.io> | 2020-02-07 18:19:51 +0000 |
commit | 1c571e5fe7a31e7accb04b37a1d3bd7c8855d05c (patch) | |
tree | 65241f1258136d0c45bcaa3b51e1393a2f595e6a /src/plugins/bearer | |
parent | 2145cdc54d5812793310f7e3b3709bfa2648bd50 (diff) | |
parent | 4e7af2061e8c323b2a21f0549643a2cfab191664 (diff) |
Merge "Merge remote-tracking branch 'origin/wip/cmake' into dev"
Diffstat (limited to 'src/plugins/bearer')
-rw-r--r-- | src/plugins/bearer/.prev_CMakeLists.txt | 12 | ||||
-rw-r--r-- | src/plugins/bearer/CMakeLists.txt | 14 | ||||
-rw-r--r-- | src/plugins/bearer/android/CMakeLists.txt | 4 | ||||
-rw-r--r-- | src/plugins/bearer/android/jar/.prev_CMakeLists.txt | 16 | ||||
-rw-r--r-- | src/plugins/bearer/android/jar/CMakeLists.txt | 22 | ||||
-rw-r--r-- | src/plugins/bearer/android/src/CMakeLists.txt | 22 | ||||
-rw-r--r-- | src/plugins/bearer/connman/.prev_CMakeLists.txt | 26 | ||||
-rw-r--r-- | src/plugins/bearer/connman/CMakeLists.txt | 25 | ||||
-rw-r--r-- | src/plugins/bearer/corewlan/CMakeLists.txt | 33 | ||||
-rw-r--r-- | src/plugins/bearer/generic/CMakeLists.txt | 31 | ||||
-rw-r--r-- | src/plugins/bearer/networkmanager/.prev_CMakeLists.txt | 26 | ||||
-rw-r--r-- | src/plugins/bearer/networkmanager/CMakeLists.txt | 25 |
12 files changed, 256 insertions, 0 deletions
diff --git a/src/plugins/bearer/.prev_CMakeLists.txt b/src/plugins/bearer/.prev_CMakeLists.txt new file mode 100644 index 0000000000..a7a36f60c6 --- /dev/null +++ b/src/plugins/bearer/.prev_CMakeLists.txt @@ -0,0 +1,12 @@ +# Generated from bearer.pro. + +if(SUBDIRS_ISEMPTY OR (TARGET Qt::DBus AND linux_x_ AND NOT ANDROID)) + add_subdirectory(generic) +endif() +if(TARGET Qt::DBus AND linux_x_ AND NOT ANDROID) + add_subdirectory(connman) + add_subdirectory(networkmanager) +endif() +if(ANDROID AND NOT ANDROID_EMBEDDED) + add_subdirectory(android) +endif() diff --git a/src/plugins/bearer/CMakeLists.txt b/src/plugins/bearer/CMakeLists.txt new file mode 100644 index 0000000000..528061d264 --- /dev/null +++ b/src/plugins/bearer/CMakeLists.txt @@ -0,0 +1,14 @@ +# Generated from bearer.pro. + +# special case begin +# The whole block is manual. +if(NOT ANDROID AND LINUX AND TARGET Qt::DBus) + add_subdirectory(generic) + add_subdirectory(connman) + add_subdirectory(networkmanager) +elseif(ANDROID AND NOT ANDROID_EMBEDDED) + add_subdirectory(android) +else() + add_subdirectory(generic) +endif() +# special case end diff --git a/src/plugins/bearer/android/CMakeLists.txt b/src/plugins/bearer/android/CMakeLists.txt new file mode 100644 index 0000000000..193cbf1fe3 --- /dev/null +++ b/src/plugins/bearer/android/CMakeLists.txt @@ -0,0 +1,4 @@ +# Generated from android.pro. + +add_subdirectory(src) +add_subdirectory(jar) diff --git a/src/plugins/bearer/android/jar/.prev_CMakeLists.txt b/src/plugins/bearer/android/jar/.prev_CMakeLists.txt new file mode 100644 index 0000000000..f5f25c4f8b --- /dev/null +++ b/src/plugins/bearer/android/jar/.prev_CMakeLists.txt @@ -0,0 +1,16 @@ +# Generated from jar.pro. + +set(java_sources + src/org/qtproject/qt5/android/bearer/QtNetworkReceiver.java +) + +add_jar(QtAndroidBearer + INCLUDE_JARS ${QT_ANDROID_JAR} + SOURCES ${java_sources} +) + +install_jar(QtAndroidBearer + DESTINATION jar + COMPONENT Devel +) + diff --git a/src/plugins/bearer/android/jar/CMakeLists.txt b/src/plugins/bearer/android/jar/CMakeLists.txt new file mode 100644 index 0000000000..16641d42b7 --- /dev/null +++ b/src/plugins/bearer/android/jar/CMakeLists.txt @@ -0,0 +1,22 @@ +##################################################################### +## QtAndroidBearer Binary: +##################################################################### + +set(java_sources + src/org/qtproject/qt5/android/bearer/QtNetworkReceiver.java +) + +add_jar(QtAndroidBearer + INCLUDE_JARS ${QT_ANDROID_JAR} + SOURCES ${java_sources} + ) + +install_jar(QtAndroidBearer + DESTINATION jar + COMPONENT Devel) + +#### Keys ignored in scope 1:.:.:jar.pro:<TRUE>: +# JAVACLASSPATH = "$$PWD/src" +# JAVASOURCES = "$$PWD/src/org/qtproject/qt5/android/bearer/QtNetworkReceiver.java" +# _LOADED = "qt_build_paths" + diff --git a/src/plugins/bearer/android/src/CMakeLists.txt b/src/plugins/bearer/android/src/CMakeLists.txt new file mode 100644 index 0000000000..d3471f4e63 --- /dev/null +++ b/src/plugins/bearer/android/src/CMakeLists.txt @@ -0,0 +1,22 @@ +# Generated from src.pro. + +##################################################################### +## QAndroidBearerEnginePlugin Plugin: +##################################################################### + +qt_add_plugin(QAndroidBearerEnginePlugin + OUTPUT_NAME qandroidbearer + TYPE bearer + SOURCES + main.cpp + qandroidbearerengine.cpp qandroidbearerengine.h + wrappers/androidconnectivitymanager.cpp wrappers/androidconnectivitymanager.h + INCLUDE_DIRECTORIES + wrappers + LIBRARIES + Qt::CorePrivate + Qt::NetworkPrivate + PUBLIC_LIBRARIES + Qt::Core + Qt::Network +) diff --git a/src/plugins/bearer/connman/.prev_CMakeLists.txt b/src/plugins/bearer/connman/.prev_CMakeLists.txt new file mode 100644 index 0000000000..55aaa41491 --- /dev/null +++ b/src/plugins/bearer/connman/.prev_CMakeLists.txt @@ -0,0 +1,26 @@ +# Generated from connman.pro. + +##################################################################### +## QConnmanEnginePlugin Plugin: +##################################################################### + +qt_add_plugin(QConnmanEnginePlugin + OUTPUT_NAME qconnmanbearer + CLASS_NAME QConnmanEnginePlugin + TYPE bearer + SOURCES + main.cpp + qconnmanengine.cpp qconnmanengine.h + qconnmanservice_linux.cpp qconnmanservice_linux_p.h + LIBRARIES + Qt::LinuxOfonoSupportPrivate + Qt::NetworkPrivate + PUBLIC_LIBRARIES + Qt::Core + Qt::DBus + Qt::LinuxOfonoSupport + Qt::Network +) + +#### Keys ignored in scope 1:.:.:connman.pro:<TRUE>: +# OTHER_FILES = "connman.json" diff --git a/src/plugins/bearer/connman/CMakeLists.txt b/src/plugins/bearer/connman/CMakeLists.txt new file mode 100644 index 0000000000..6e5f34f6a4 --- /dev/null +++ b/src/plugins/bearer/connman/CMakeLists.txt @@ -0,0 +1,25 @@ +# Generated from connman.pro. + +##################################################################### +## QConnmanEnginePlugin Plugin: +##################################################################### + +qt_add_plugin(QConnmanEnginePlugin + OUTPUT_NAME qconnmanbearer + TYPE bearer + SOURCES + main.cpp + qconnmanengine.cpp qconnmanengine.h + qconnmanservice_linux.cpp qconnmanservice_linux_p.h + LIBRARIES + Qt::LinuxOfonoSupportPrivate + Qt::NetworkPrivate + PUBLIC_LIBRARIES + Qt::Core + Qt::DBus + Qt::LinuxOfonoSupport + Qt::Network +) + +#### Keys ignored in scope 1:.:.:connman.pro:<TRUE>: +# OTHER_FILES = "connman.json" diff --git a/src/plugins/bearer/corewlan/CMakeLists.txt b/src/plugins/bearer/corewlan/CMakeLists.txt new file mode 100644 index 0000000000..eda3b85499 --- /dev/null +++ b/src/plugins/bearer/corewlan/CMakeLists.txt @@ -0,0 +1,33 @@ +# Generated from corewlan.pro. + +##################################################################### +## QCoreWlanEnginePlugin Plugin: +##################################################################### + +qt_add_plugin(QCoreWlanEnginePlugin + OUTPUT_NAME qcorewlanbearer + TYPE bearer + SOURCES + main.cpp + qcorewlanengine.h qcorewlanengine.mm + LIBRARIES + Qt::CorePrivate + Qt::NetworkPrivate + PUBLIC_LIBRARIES + ${FWFoundation} + ${FWSystemConfiguration} + Qt::Core + Qt::Network +) + +#### Keys ignored in scope 1:.:.:corewlan.pro:<TRUE>: +# OTHER_FILES = "corewlan.json" + +## Scopes: +##################################################################### + +qt_extend_target(QCoreWlanEnginePlugin CONDITION QT_FEATURE_corewlan + PUBLIC_LIBRARIES + ${FWCoreWLAN} + ${FWSecurity} +) diff --git a/src/plugins/bearer/generic/CMakeLists.txt b/src/plugins/bearer/generic/CMakeLists.txt new file mode 100644 index 0000000000..0717b83dd3 --- /dev/null +++ b/src/plugins/bearer/generic/CMakeLists.txt @@ -0,0 +1,31 @@ +# Generated from generic.pro. + +##################################################################### +## QGenericEnginePlugin Plugin: +##################################################################### + +qt_add_plugin(QGenericEnginePlugin + OUTPUT_NAME qgenericbearer + TYPE bearer + SOURCES + ../platformdefs_win.h + main.cpp + qgenericengine.cpp qgenericengine.h + LIBRARIES + Qt::CorePrivate + Qt::NetworkPrivate + PUBLIC_LIBRARIES + Qt::Core + Qt::Network +) + +#### Keys ignored in scope 1:.:.:generic.pro:<TRUE>: +# OTHER_FILES = "generic.json" + +## Scopes: +##################################################################### + +qt_extend_target(QGenericEnginePlugin CONDITION WIN32 AND NOT WINRT + PUBLIC_LIBRARIES + iphlpapi +) diff --git a/src/plugins/bearer/networkmanager/.prev_CMakeLists.txt b/src/plugins/bearer/networkmanager/.prev_CMakeLists.txt new file mode 100644 index 0000000000..df5927024d --- /dev/null +++ b/src/plugins/bearer/networkmanager/.prev_CMakeLists.txt @@ -0,0 +1,26 @@ +# Generated from networkmanager.pro. + +##################################################################### +## QNetworkManagerEnginePlugin Plugin: +##################################################################### + +qt_add_plugin(QNetworkManagerEnginePlugin + OUTPUT_NAME qnmbearer + CLASS_NAME QNetworkManagerEnginePlugin + TYPE bearer + SOURCES + main.cpp + qnetworkmanagerengine.cpp qnetworkmanagerengine.h + qnetworkmanagerservice.cpp qnetworkmanagerservice.h + LIBRARIES + Qt::LinuxOfonoSupportPrivate + Qt::NetworkPrivate + PUBLIC_LIBRARIES + Qt::Core + Qt::DBus + Qt::LinuxOfonoSupport + Qt::Network +) + +#### Keys ignored in scope 1:.:.:networkmanager.pro:<TRUE>: +# OTHER_FILES = "networkmanager.json" diff --git a/src/plugins/bearer/networkmanager/CMakeLists.txt b/src/plugins/bearer/networkmanager/CMakeLists.txt new file mode 100644 index 0000000000..9c9721cca7 --- /dev/null +++ b/src/plugins/bearer/networkmanager/CMakeLists.txt @@ -0,0 +1,25 @@ +# Generated from networkmanager.pro. + +##################################################################### +## QNetworkManagerEnginePlugin Plugin: +##################################################################### + +qt_add_plugin(QNetworkManagerEnginePlugin + OUTPUT_NAME qnmbearer + TYPE bearer + SOURCES + main.cpp + qnetworkmanagerengine.cpp qnetworkmanagerengine.h + qnetworkmanagerservice.cpp qnetworkmanagerservice.h + LIBRARIES + Qt::LinuxOfonoSupportPrivate + Qt::NetworkPrivate + PUBLIC_LIBRARIES + Qt::Core + Qt::DBus + Qt::LinuxOfonoSupport + Qt::Network +) + +#### Keys ignored in scope 1:.:.:networkmanager.pro:<TRUE>: +# OTHER_FILES = "networkmanager.json" |