From d516e5228cb2cf804c4675a80178838e039cc0b2 Mon Sep 17 00:00:00 2001 From: Daniel Brunner <0xFEEDC0DE64@gmail.com> Date: Sun, 16 Dec 2018 20:36:22 +0100 Subject: [PATCH] Bumped plugins and added find_package --- plugins/absenceplugin | 2 +- plugins/advancedviewplugin | 2 +- plugins/devtoolsplugin | 2 +- plugins/exportplugin | 2 +- plugins/lunchmealplugin | 2 +- plugins/presenceplugin | 2 +- plugins/profileplugin | 2 +- plugins/reportsplugin | 2 +- plugins/sketchplugin | 2 +- plugins/updaterplugin | 2 +- plugins/weatherplugin | 2 +- plugins/webradioplugin | 2 +- zeiterfassungclient/CMakeLists.txt | 6 ++++++ zeiterfassungcorelib/CMakeLists.txt | 3 +++ zeiterfassungguilib/CMakeLists.txt | 6 ++++++ zeiterfassungnetworklib/CMakeLists.txt | 4 ++++ 16 files changed, 31 insertions(+), 12 deletions(-) diff --git a/plugins/absenceplugin b/plugins/absenceplugin index 78fc9d5..a11f8a9 160000 --- a/plugins/absenceplugin +++ b/plugins/absenceplugin @@ -1 +1 @@ -Subproject commit 78fc9d522c15578eefff91a1706fd842ea12c4b9 +Subproject commit a11f8a92fd4febd165f056602f26b561d8435fa6 diff --git a/plugins/advancedviewplugin b/plugins/advancedviewplugin index e398b45..22843c0 160000 --- a/plugins/advancedviewplugin +++ b/plugins/advancedviewplugin @@ -1 +1 @@ -Subproject commit e398b4577d0bc5d6e4d594df2605ab725bb7a385 +Subproject commit 22843c065f7596f59c06068b61d18f711ad7c9d8 diff --git a/plugins/devtoolsplugin b/plugins/devtoolsplugin index 53559c4..8e4fceb 160000 --- a/plugins/devtoolsplugin +++ b/plugins/devtoolsplugin @@ -1 +1 @@ -Subproject commit 53559c45a0690de67b431df686dcd4eb7997d76f +Subproject commit 8e4fceb8218d6cce07a25e6c2ad4736cf14f6149 diff --git a/plugins/exportplugin b/plugins/exportplugin index 3a65f07..2229600 160000 --- a/plugins/exportplugin +++ b/plugins/exportplugin @@ -1 +1 @@ -Subproject commit 3a65f07af2e508e9976412a2e0f3528cb4dd56c0 +Subproject commit 222960053cf01d99e7ffb3b603514c597aaef590 diff --git a/plugins/lunchmealplugin b/plugins/lunchmealplugin index 4565bd2..cda6dd0 160000 --- a/plugins/lunchmealplugin +++ b/plugins/lunchmealplugin @@ -1 +1 @@ -Subproject commit 4565bd22c894a3c20e3d811ea6f22af9d4a5061a +Subproject commit cda6dd0ed67024916aba4cf1b5d9673405566f2c diff --git a/plugins/presenceplugin b/plugins/presenceplugin index 5d3a944..75258f9 160000 --- a/plugins/presenceplugin +++ b/plugins/presenceplugin @@ -1 +1 @@ -Subproject commit 5d3a94436e5b7f092ed31fbc82b5bd551b55ddd6 +Subproject commit 75258f956bfd0845893faa11481ec6733f25efd1 diff --git a/plugins/profileplugin b/plugins/profileplugin index 10b6084..dc39a06 160000 --- a/plugins/profileplugin +++ b/plugins/profileplugin @@ -1 +1 @@ -Subproject commit 10b6084a53580ac5b94c010d4f7575ffcc6c5cc0 +Subproject commit dc39a06b64a0a14918f33cd71d090ee9e6e797aa diff --git a/plugins/reportsplugin b/plugins/reportsplugin index 79f9fb4..9f2ab30 160000 --- a/plugins/reportsplugin +++ b/plugins/reportsplugin @@ -1 +1 @@ -Subproject commit 79f9fb451b3a6416dba4568b46f36de136efbb7f +Subproject commit 9f2ab30880c07b86e3a72dfd244468deab1fc5f5 diff --git a/plugins/sketchplugin b/plugins/sketchplugin index a523ae8..090db56 160000 --- a/plugins/sketchplugin +++ b/plugins/sketchplugin @@ -1 +1 @@ -Subproject commit a523ae82f3e2114aaf48425f487f1f5597d91f83 +Subproject commit 090db563338c3625661d7617551e00fd52b38a7a diff --git a/plugins/updaterplugin b/plugins/updaterplugin index 1cfceb0..3bc0241 160000 --- a/plugins/updaterplugin +++ b/plugins/updaterplugin @@ -1 +1 @@ -Subproject commit 1cfceb076145607d4f00439dc9f9ecae27536657 +Subproject commit 3bc02414e228f5517ead2102f82e47b5aea576ca diff --git a/plugins/weatherplugin b/plugins/weatherplugin index 7f96f31..bf97b98 160000 --- a/plugins/weatherplugin +++ b/plugins/weatherplugin @@ -1 +1 @@ -Subproject commit 7f96f31f6b01c49953996cea962e4fceafeabbe4 +Subproject commit bf97b9850deed5ea36fe6f3f588d4944440863e5 diff --git a/plugins/webradioplugin b/plugins/webradioplugin index 2b4afe6..44ce876 160000 --- a/plugins/webradioplugin +++ b/plugins/webradioplugin @@ -1 +1 @@ -Subproject commit 2b4afe687e11b3cc3acdf3f474e4b2afe6b351f7 +Subproject commit 44ce876bc1a19d07e7f2bef5b851d82c1a41fbc0 diff --git a/zeiterfassungclient/CMakeLists.txt b/zeiterfassungclient/CMakeLists.txt index ad58299..f484d36 100644 --- a/zeiterfassungclient/CMakeLists.txt +++ b/zeiterfassungclient/CMakeLists.txt @@ -1,3 +1,9 @@ +find_package(Qt5Core CONFIG REQUIRED) +find_package(Qt5Gui CONFIG REQUIRED) +find_package(Qt5Widgets CONFIG REQUIRED) +find_package(Qt5Network CONFIG REQUIRED) +find_package(Qt5LinguistTools CONFIG REQUIRED) + set(HEADERS ) diff --git a/zeiterfassungcorelib/CMakeLists.txt b/zeiterfassungcorelib/CMakeLists.txt index b149ef2..d6a51c0 100644 --- a/zeiterfassungcorelib/CMakeLists.txt +++ b/zeiterfassungcorelib/CMakeLists.txt @@ -1,3 +1,6 @@ +find_package(Qt5Core CONFIG REQUIRED) +find_package(Qt5LinguistTools CONFIG REQUIRED) + set(HEADERS zeiterfassungcorelib_global.h zeiterfassungsettings.h diff --git a/zeiterfassungguilib/CMakeLists.txt b/zeiterfassungguilib/CMakeLists.txt index 841a8cc..384946b 100644 --- a/zeiterfassungguilib/CMakeLists.txt +++ b/zeiterfassungguilib/CMakeLists.txt @@ -1,3 +1,9 @@ +find_package(Qt5Core CONFIG REQUIRED) +find_package(Qt5Gui CONFIG REQUIRED) +find_package(Qt5Widgets CONFIG REQUIRED) +find_package(Qt5UiTools CONFIG REQUIRED) +find_package(Qt5LinguistTools CONFIG REQUIRED) + set(HEADERS mainwindow.h settingswidget.h diff --git a/zeiterfassungnetworklib/CMakeLists.txt b/zeiterfassungnetworklib/CMakeLists.txt index 8556410..91bc75f 100644 --- a/zeiterfassungnetworklib/CMakeLists.txt +++ b/zeiterfassungnetworklib/CMakeLists.txt @@ -1,3 +1,7 @@ +find_package(Qt5Core CONFIG REQUIRED) +find_package(Qt5Network CONFIG REQUIRED) +find_package(Qt5LinguistTools CONFIG REQUIRED) + set(HEADERS zeiterfassungapi.h zeiterfassungnetworklib_global.h