diff options
author | Andreas Buhr <andreas@andreasbuhr.de> | 2021-01-15 17:44:04 +0100 |
---|---|---|
committer | Andreas Buhr <andreas.buhr@qt.io> | 2021-01-27 09:48:42 +0100 |
commit | ff64b8ef2dfd1c04bf2f950a76526c907911aeb1 (patch) | |
tree | 56d40f805f9127d17673dcf63969378c07fa4d00 /src/plugins | |
parent | 867b4d428f78fffe7fefeffaa2f819c9f345da26 (diff) |
Port to CMake
Task-number: QTBUG-90399
Change-Id: I0521231e7d61809f38c44215b5cd923b292b9e02
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/plugins')
-rw-r--r-- | src/plugins/CMakeLists.txt | 1 | ||||
-rw-r--r-- | src/plugins/canbus/CMakeLists.txt | 15 | ||||
-rw-r--r-- | src/plugins/canbus/canbus.pro | 18 | ||||
-rw-r--r-- | src/plugins/canbus/passthrucan/CMakeLists.txt | 15 | ||||
-rw-r--r-- | src/plugins/canbus/passthrucan/passthrucan.pro | 20 | ||||
-rw-r--r-- | src/plugins/canbus/peakcan/CMakeLists.txt | 15 | ||||
-rw-r--r-- | src/plugins/canbus/peakcan/peakcan.pro | 18 | ||||
-rw-r--r-- | src/plugins/canbus/socketcan/CMakeLists.txt | 15 | ||||
-rw-r--r-- | src/plugins/canbus/socketcan/socketcan.pro | 18 | ||||
-rw-r--r-- | src/plugins/canbus/systeccan/CMakeLists.txt | 15 | ||||
-rw-r--r-- | src/plugins/canbus/systeccan/systeccan.pro | 18 | ||||
-rw-r--r-- | src/plugins/canbus/tinycan/CMakeLists.txt | 15 | ||||
-rw-r--r-- | src/plugins/canbus/tinycan/tinycan.pro | 17 | ||||
-rw-r--r-- | src/plugins/canbus/vectorcan/CMakeLists.txt | 15 | ||||
-rw-r--r-- | src/plugins/canbus/vectorcan/vectorcan.pro | 18 | ||||
-rw-r--r-- | src/plugins/canbus/virtualcan/CMakeLists.txt | 15 | ||||
-rw-r--r-- | src/plugins/canbus/virtualcan/virtualcan.pro | 16 | ||||
-rw-r--r-- | src/plugins/plugins.pro | 3 |
18 files changed, 121 insertions, 146 deletions
diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt new file mode 100644 index 0000000..83a5822 --- /dev/null +++ b/src/plugins/CMakeLists.txt @@ -0,0 +1 @@ +add_subdirectory(canbus) diff --git a/src/plugins/canbus/CMakeLists.txt b/src/plugins/canbus/CMakeLists.txt new file mode 100644 index 0000000..c8a5144 --- /dev/null +++ b/src/plugins/canbus/CMakeLists.txt @@ -0,0 +1,15 @@ +add_subdirectory(virtualcan) +if(QT_FEATURE_socketcan) + add_subdirectory(socketcan) +endif() +if(QT_FEATURE_library) + add_subdirectory(passthrucan) + add_subdirectory(peakcan) + add_subdirectory(tinycan) +endif() +if(QT_FEATURE_library AND WIN32) + add_subdirectory(systeccan) +endif() +if(QT_FEATURE_library AND WIN32 AND NOT WINRT) + add_subdirectory(vectorcan) +endif() diff --git a/src/plugins/canbus/canbus.pro b/src/plugins/canbus/canbus.pro deleted file mode 100644 index ab9755c..0000000 --- a/src/plugins/canbus/canbus.pro +++ /dev/null @@ -1,18 +0,0 @@ -TEMPLATE = subdirs - -include($$OUT_PWD/../../serialbus/qtserialbus-config.pri) -QT_FOR_CONFIG += serialbus-private - -SUBDIRS += virtualcan - -qtConfig(socketcan) { - SUBDIRS += socketcan -} - -qtConfig(library) { - SUBDIRS += passthrucan peakcan tinycan - win32 { - SUBDIRS += systeccan - !winrt:SUBDIRS += vectorcan - } -} diff --git a/src/plugins/canbus/passthrucan/CMakeLists.txt b/src/plugins/canbus/passthrucan/CMakeLists.txt new file mode 100644 index 0000000..f47a874 --- /dev/null +++ b/src/plugins/canbus/passthrucan/CMakeLists.txt @@ -0,0 +1,15 @@ +##################################################################### +## PassThruCanBusPlugin Plugin: +##################################################################### + +qt_internal_add_plugin(PassThruCanBusPlugin + OUTPUT_NAME qtpassthrucanbus + TYPE canbus + SOURCES + j2534passthru.cpp j2534passthru.h + main.cpp + passthrucanbackend.cpp passthrucanbackend.h + passthrucanio.cpp passthrucanio.h + PUBLIC_LIBRARIES + Qt::SerialBus +) diff --git a/src/plugins/canbus/passthrucan/passthrucan.pro b/src/plugins/canbus/passthrucan/passthrucan.pro deleted file mode 100644 index cb9bdc5..0000000 --- a/src/plugins/canbus/passthrucan/passthrucan.pro +++ /dev/null @@ -1,20 +0,0 @@ -QT = serialbus - -TARGET = qtpassthrucanbus - -SOURCES += \ - j2534passthru.cpp \ - main.cpp \ - passthrucanio.cpp \ - passthrucanbackend.cpp - -HEADERS += \ - j2534passthru.h \ - passthrucanio.h \ - passthrucanbackend.h - -DISTFILES = plugin.json - -PLUGIN_TYPE = canbus -PLUGIN_CLASS_NAME = PassThruCanBusPlugin -load(qt_plugin) diff --git a/src/plugins/canbus/peakcan/CMakeLists.txt b/src/plugins/canbus/peakcan/CMakeLists.txt new file mode 100644 index 0000000..ce0861d --- /dev/null +++ b/src/plugins/canbus/peakcan/CMakeLists.txt @@ -0,0 +1,15 @@ +##################################################################### +## PeakCanBusPlugin Plugin: +##################################################################### + +qt_internal_add_plugin(PeakCanBusPlugin + OUTPUT_NAME qtpeakcanbus + TYPE canbus + SOURCES + main.cpp + peakcan_symbols_p.h + peakcanbackend.cpp peakcanbackend.h peakcanbackend_p.h + PUBLIC_LIBRARIES + Qt::Core + Qt::SerialBus +) diff --git a/src/plugins/canbus/peakcan/peakcan.pro b/src/plugins/canbus/peakcan/peakcan.pro deleted file mode 100644 index d5b809c..0000000 --- a/src/plugins/canbus/peakcan/peakcan.pro +++ /dev/null @@ -1,18 +0,0 @@ -TARGET = qtpeakcanbus - -QT = core serialbus - -HEADERS += \ - peakcanbackend.h \ - peakcanbackend_p.h \ - peakcan_symbols_p.h - -SOURCES += \ - main.cpp \ - peakcanbackend.cpp - -DISTFILES = plugin.json - -PLUGIN_TYPE = canbus -PLUGIN_CLASS_NAME = PeakCanBusPlugin -load(qt_plugin) diff --git a/src/plugins/canbus/socketcan/CMakeLists.txt b/src/plugins/canbus/socketcan/CMakeLists.txt new file mode 100644 index 0000000..34872d2 --- /dev/null +++ b/src/plugins/canbus/socketcan/CMakeLists.txt @@ -0,0 +1,15 @@ +##################################################################### +## SocketCanBusPlugin Plugin: +##################################################################### + +qt_internal_add_plugin(SocketCanBusPlugin + OUTPUT_NAME qtsocketcanbus + TYPE canbus + SOURCES + libsocketcan.cpp libsocketcan.h + main.cpp + socketcanbackend.cpp socketcanbackend.h + PUBLIC_LIBRARIES + Qt::Core + Qt::SerialBus +) diff --git a/src/plugins/canbus/socketcan/socketcan.pro b/src/plugins/canbus/socketcan/socketcan.pro deleted file mode 100644 index cd731fd..0000000 --- a/src/plugins/canbus/socketcan/socketcan.pro +++ /dev/null @@ -1,18 +0,0 @@ -TARGET = qtsocketcanbus - -QT = core serialbus - -HEADERS += \ - libsocketcan.h \ - socketcanbackend.h - -SOURCES += \ - libsocketcan.cpp \ - main.cpp \ - socketcanbackend.cpp - -DISTFILES = plugin.json - -PLUGIN_TYPE = canbus -PLUGIN_CLASS_NAME = SocketCanBusPlugin -load(qt_plugin) diff --git a/src/plugins/canbus/systeccan/CMakeLists.txt b/src/plugins/canbus/systeccan/CMakeLists.txt new file mode 100644 index 0000000..4b11932 --- /dev/null +++ b/src/plugins/canbus/systeccan/CMakeLists.txt @@ -0,0 +1,15 @@ +##################################################################### +## SystecCanBusPlugin Plugin: +##################################################################### + +qt_internal_add_plugin(SystecCanBusPlugin + OUTPUT_NAME qtsysteccanbus + TYPE canbus + SOURCES + main.cpp + systeccan_symbols_p.h + systeccanbackend.cpp systeccanbackend.h systeccanbackend_p.h + PUBLIC_LIBRARIES + Qt::Core + Qt::SerialBus +) diff --git a/src/plugins/canbus/systeccan/systeccan.pro b/src/plugins/canbus/systeccan/systeccan.pro deleted file mode 100644 index 3520325..0000000 --- a/src/plugins/canbus/systeccan/systeccan.pro +++ /dev/null @@ -1,18 +0,0 @@ -TARGET = qtsysteccanbus - -QT = core serialbus - -HEADERS += \ - systeccanbackend.h \ - systeccanbackend_p.h \ - systeccan_symbols_p.h - -SOURCES += \ - main.cpp \ - systeccanbackend.cpp - -DISTFILES = plugin.json - -PLUGIN_TYPE = canbus -PLUGIN_CLASS_NAME = SystecCanBusPlugin -load(qt_plugin) diff --git a/src/plugins/canbus/tinycan/CMakeLists.txt b/src/plugins/canbus/tinycan/CMakeLists.txt new file mode 100644 index 0000000..dc2e306 --- /dev/null +++ b/src/plugins/canbus/tinycan/CMakeLists.txt @@ -0,0 +1,15 @@ +##################################################################### +## TinyCanBusPlugin Plugin: +##################################################################### + +qt_internal_add_plugin(TinyCanBusPlugin + OUTPUT_NAME qttinycanbus + TYPE canbus + SOURCES + main.cpp + tinycan_symbols_p.h + tinycanbackend.cpp tinycanbackend.h tinycanbackend_p.h + PUBLIC_LIBRARIES + Qt::Core + Qt::SerialBus +) diff --git a/src/plugins/canbus/tinycan/tinycan.pro b/src/plugins/canbus/tinycan/tinycan.pro deleted file mode 100644 index c450bb9..0000000 --- a/src/plugins/canbus/tinycan/tinycan.pro +++ /dev/null @@ -1,17 +0,0 @@ -TARGET = qttinycanbus - -QT = core serialbus - -HEADERS += \ - tinycanbackend.h \ - tinycanbackend_p.h \ - tinycan_symbols_p.h - -SOURCES += main.cpp \ - tinycanbackend.cpp - -DISTFILES = plugin.json - -PLUGIN_TYPE = canbus -PLUGIN_CLASS_NAME = TinyCanBusPlugin -load(qt_plugin) diff --git a/src/plugins/canbus/vectorcan/CMakeLists.txt b/src/plugins/canbus/vectorcan/CMakeLists.txt new file mode 100644 index 0000000..0c81c15 --- /dev/null +++ b/src/plugins/canbus/vectorcan/CMakeLists.txt @@ -0,0 +1,15 @@ +##################################################################### +## VectorCanBusPlugin Plugin: +##################################################################### + +qt_internal_add_plugin(VectorCanBusPlugin + OUTPUT_NAME qtvectorcanbus + TYPE canbus + SOURCES + main.cpp + vectorcan_symbols_p.h + vectorcanbackend.cpp vectorcanbackend.h vectorcanbackend_p.h + PUBLIC_LIBRARIES + Qt::Core + Qt::SerialBus +) diff --git a/src/plugins/canbus/vectorcan/vectorcan.pro b/src/plugins/canbus/vectorcan/vectorcan.pro deleted file mode 100644 index 847f2aa..0000000 --- a/src/plugins/canbus/vectorcan/vectorcan.pro +++ /dev/null @@ -1,18 +0,0 @@ -TARGET = qtvectorcanbus - -QT = core serialbus - -HEADERS += \ - vectorcanbackend.h \ - vectorcanbackend_p.h \ - vectorcan_symbols_p.h - -SOURCES += \ - main.cpp \ - vectorcanbackend.cpp - -DISTFILES = plugin.json - -PLUGIN_TYPE = canbus -PLUGIN_CLASS_NAME = VectorCanBusPlugin -load(qt_plugin) diff --git a/src/plugins/canbus/virtualcan/CMakeLists.txt b/src/plugins/canbus/virtualcan/CMakeLists.txt new file mode 100644 index 0000000..a0b456c --- /dev/null +++ b/src/plugins/canbus/virtualcan/CMakeLists.txt @@ -0,0 +1,15 @@ +##################################################################### +## VirtualCanBusPlugin Plugin: +##################################################################### + +qt_internal_add_plugin(VirtualCanBusPlugin + OUTPUT_NAME qtvirtualcanbus + TYPE canbus + SOURCES + main.cpp + virtualcanbackend.cpp virtualcanbackend.h + PUBLIC_LIBRARIES + Qt::Core + Qt::Network + Qt::SerialBus +) diff --git a/src/plugins/canbus/virtualcan/virtualcan.pro b/src/plugins/canbus/virtualcan/virtualcan.pro deleted file mode 100644 index d719f70..0000000 --- a/src/plugins/canbus/virtualcan/virtualcan.pro +++ /dev/null @@ -1,16 +0,0 @@ -TARGET = qtvirtualcanbus - -QT = core network serialbus - -HEADERS += \ - virtualcanbackend.h - -SOURCES += \ - main.cpp \ - virtualcanbackend.cpp - -DISTFILES = plugin.json - -PLUGIN_TYPE = canbus -PLUGIN_CLASS_NAME = VirtualCanBusPlugin -load(qt_plugin) diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro deleted file mode 100644 index 456289e..0000000 --- a/src/plugins/plugins.pro +++ /dev/null @@ -1,3 +0,0 @@ -TEMPLATE = subdirs - -SUBDIRS += canbus |