diff --git a/CMakeLists.txt b/CMakeLists.txt index 9308c6f..827fbca 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,7 @@ +add_custom_target(zeiterfassung) + add_subdirectory(plugins) -add_subdirectory(zeiterfassung) +add_subdirectory(zeiterfassungclient) add_subdirectory(zeiterfassungcorelib) add_subdirectory(zeiterfassungguilib) add_subdirectory(zeiterfassungnetworklib) diff --git a/DbZeiterfassung.pro b/DbZeiterfassung.pro index 4c293b8..5459ac9 100644 --- a/DbZeiterfassung.pro +++ b/DbZeiterfassung.pro @@ -1,7 +1,7 @@ TEMPLATE = subdirs SUBDIRS += plugins \ - zeiterfassung \ + zeiterfassungclient \ zeiterfassungcorelib \ zeiterfassungguilib \ zeiterfassungnetworklib diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index 5629b47..d4e1d39 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -1,11 +1,14 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/plugins/zeiterfassung) +add_custom_target(zeiterfassung-plugins) +add_dependencies(zeiterfassung zeiterfassung-plugins) + add_subdirectory(absenceplugin) add_subdirectory(advancedviewplugin) add_subdirectory(devtoolsplugin) add_subdirectory(lunchmealplugin) -add_subdirectory(profileplugin) add_subdirectory(presenceplugin) +add_subdirectory(profileplugin) add_subdirectory(reportsplugin) add_subdirectory(sketchplugin) add_subdirectory(updaterplugin) diff --git a/plugins/absenceplugin b/plugins/absenceplugin index 19df075..ff22606 160000 --- a/plugins/absenceplugin +++ b/plugins/absenceplugin @@ -1 +1 @@ -Subproject commit 19df07591aa2372c0d44e634351d43d958c914bc +Subproject commit ff226068ed76ff9c2a01a2aaa21b7fa21413a55b diff --git a/plugins/advancedviewplugin b/plugins/advancedviewplugin index ebf2bb2..91f5f71 160000 --- a/plugins/advancedviewplugin +++ b/plugins/advancedviewplugin @@ -1 +1 @@ -Subproject commit ebf2bb2b57032fcef3f6ad88083d971c01ad3571 +Subproject commit 91f5f719e423cf81c486b3128b12898b5c7de32a diff --git a/plugins/devtoolsplugin b/plugins/devtoolsplugin index 563ca2b..172c482 160000 --- a/plugins/devtoolsplugin +++ b/plugins/devtoolsplugin @@ -1 +1 @@ -Subproject commit 563ca2bf729d41e18a3e72bd198d62a708f494f8 +Subproject commit 172c48225f513e1679c0d39dbb32da4727c8891d diff --git a/plugins/lunchmealplugin b/plugins/lunchmealplugin index 4940a6a..dda58d4 160000 --- a/plugins/lunchmealplugin +++ b/plugins/lunchmealplugin @@ -1 +1 @@ -Subproject commit 4940a6a78a61bc180f86a2e40866afad3132cff5 +Subproject commit dda58d464cbdaee4d2a835f3f02dbade01e6f282 diff --git a/plugins/presenceplugin b/plugins/presenceplugin index a75dc13..50cd928 160000 --- a/plugins/presenceplugin +++ b/plugins/presenceplugin @@ -1 +1 @@ -Subproject commit a75dc1300cba255a0b03877a817a0051182a1b76 +Subproject commit 50cd928ec4b807d1a0e6aeabce4f4483190650c3 diff --git a/plugins/profileplugin b/plugins/profileplugin index b3f8d8a..a5aa41f 160000 --- a/plugins/profileplugin +++ b/plugins/profileplugin @@ -1 +1 @@ -Subproject commit b3f8d8ab867db274c7639a828cd49b7df78bdf81 +Subproject commit a5aa41f85ede03cd52b82afd71a8e492ab42f76c diff --git a/plugins/reportsplugin b/plugins/reportsplugin index a6ca514..4c797f7 160000 --- a/plugins/reportsplugin +++ b/plugins/reportsplugin @@ -1 +1 @@ -Subproject commit a6ca514345f49d7bfb577da4aaec60f3b984b020 +Subproject commit 4c797f7233b133823853166d58c800124aa11a0a diff --git a/plugins/sketchplugin b/plugins/sketchplugin index a720284..ea005c0 160000 --- a/plugins/sketchplugin +++ b/plugins/sketchplugin @@ -1 +1 @@ -Subproject commit a7202849d31f7f3b354bbc5e708fc08c2de5dacf +Subproject commit ea005c0cd8c8222cfb577c088d4a0d181757a6c5 diff --git a/plugins/updaterplugin b/plugins/updaterplugin index d216fb1..a9a6234 160000 --- a/plugins/updaterplugin +++ b/plugins/updaterplugin @@ -1 +1 @@ -Subproject commit d216fb171b57f34dacd5dfa9fbe7211334d47762 +Subproject commit a9a6234ca27844d0b0b460af0c2c8c6ed59b8ad8 diff --git a/plugins/weatherplugin b/plugins/weatherplugin index 4dda1d4..9cbd921 160000 --- a/plugins/weatherplugin +++ b/plugins/weatherplugin @@ -1 +1 @@ -Subproject commit 4dda1d43d3e0492b501d414427c87d1fdcebf55d +Subproject commit 9cbd921f5fd433923a7921bb6458bc6eaa0c1857 diff --git a/plugins/webradioplugin b/plugins/webradioplugin index a36604a..e5c20c3 160000 --- a/plugins/webradioplugin +++ b/plugins/webradioplugin @@ -1 +1 @@ -Subproject commit a36604add08d655efc691af3f1bc216a8cf9b7ba +Subproject commit e5c20c352c2441f93330fe5bec0da02c6414716c diff --git a/zeiterfassung/CMakeLists.txt b/zeiterfassung/CMakeLists.txt deleted file mode 100644 index e0743cb..0000000 --- a/zeiterfassung/CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ -set(HEADERS -) - -set(SOURCES - main.cpp -) - -set(FORMS - strips/bookingendstrip.ui - strips/bookingstartstrip.ui - strips/timeassignmentstrip.ui -) - -add_executable(zeiterfassung ${HEADERS} ${SOURCES} ${FORMS}) - -target_link_libraries(zeiterfassung Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network zeiterfassungcorelib zeiterfassungguilib zeiterfassungnetworklib) diff --git a/zeiterfassungclient/CMakeLists.txt b/zeiterfassungclient/CMakeLists.txt new file mode 100644 index 0000000..0d62875 --- /dev/null +++ b/zeiterfassungclient/CMakeLists.txt @@ -0,0 +1,23 @@ +set(HEADERS +) + +set(SOURCES + main.cpp +) + +set(RESOURCES + zeiterfassung_resources.qrc +) + +set(FORMS + strips/bookingendstrip.ui + strips/bookingstartstrip.ui + strips/timeassignmentstrip.ui +) + +# TODO: add icon.ico for windows +add_executable(zeiterfassungclient ${HEADERS} ${SOURCES} ${RESOURCES} ${FORMS}) + +target_link_libraries(zeiterfassungclient Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network zeiterfassungcorelib zeiterfassungguilib zeiterfassungnetworklib) + +add_dependencies(zeiterfassung zeiterfassungclient) diff --git a/zeiterfassung/icon.ico b/zeiterfassungclient/icon.ico similarity index 100% rename from zeiterfassung/icon.ico rename to zeiterfassungclient/icon.ico diff --git a/zeiterfassung/images/splash.png b/zeiterfassungclient/images/splash.png similarity index 100% rename from zeiterfassung/images/splash.png rename to zeiterfassungclient/images/splash.png diff --git a/zeiterfassung/installs.pri b/zeiterfassungclient/installs.pri similarity index 100% rename from zeiterfassung/installs.pri rename to zeiterfassungclient/installs.pri diff --git a/zeiterfassung/main.cpp b/zeiterfassungclient/main.cpp similarity index 100% rename from zeiterfassung/main.cpp rename to zeiterfassungclient/main.cpp diff --git a/zeiterfassung/strips/bookingendstrip.ui b/zeiterfassungclient/strips/bookingendstrip.ui similarity index 100% rename from zeiterfassung/strips/bookingendstrip.ui rename to zeiterfassungclient/strips/bookingendstrip.ui diff --git a/zeiterfassung/strips/bookingstartstrip.ui b/zeiterfassungclient/strips/bookingstartstrip.ui similarity index 100% rename from zeiterfassung/strips/bookingstartstrip.ui rename to zeiterfassungclient/strips/bookingstartstrip.ui diff --git a/zeiterfassung/strips/timeassignmentstrip.ui b/zeiterfassungclient/strips/timeassignmentstrip.ui similarity index 100% rename from zeiterfassung/strips/timeassignmentstrip.ui rename to zeiterfassungclient/strips/timeassignmentstrip.ui diff --git a/zeiterfassung/themes/dark_theme.qss b/zeiterfassungclient/themes/dark_theme.qss similarity index 100% rename from zeiterfassung/themes/dark_theme.qss rename to zeiterfassungclient/themes/dark_theme.qss diff --git a/zeiterfassung/themes/dark_theme/Hmovetoolbar.png b/zeiterfassungclient/themes/dark_theme/Hmovetoolbar.png similarity index 100% rename from zeiterfassung/themes/dark_theme/Hmovetoolbar.png rename to zeiterfassungclient/themes/dark_theme/Hmovetoolbar.png diff --git a/zeiterfassung/themes/dark_theme/Hsepartoolbar.png b/zeiterfassungclient/themes/dark_theme/Hsepartoolbar.png similarity index 100% rename from zeiterfassung/themes/dark_theme/Hsepartoolbar.png rename to zeiterfassungclient/themes/dark_theme/Hsepartoolbar.png diff --git a/zeiterfassung/themes/dark_theme/Vmovetoolbar.png b/zeiterfassungclient/themes/dark_theme/Vmovetoolbar.png similarity index 100% rename from zeiterfassung/themes/dark_theme/Vmovetoolbar.png rename to zeiterfassungclient/themes/dark_theme/Vmovetoolbar.png diff --git a/zeiterfassung/themes/dark_theme/Vsepartoolbar.png b/zeiterfassungclient/themes/dark_theme/Vsepartoolbar.png similarity index 100% rename from zeiterfassung/themes/dark_theme/Vsepartoolbar.png rename to zeiterfassungclient/themes/dark_theme/Vsepartoolbar.png diff --git a/zeiterfassung/themes/dark_theme/branch_closed-on.png b/zeiterfassungclient/themes/dark_theme/branch_closed-on.png similarity index 100% rename from zeiterfassung/themes/dark_theme/branch_closed-on.png rename to zeiterfassungclient/themes/dark_theme/branch_closed-on.png diff --git a/zeiterfassung/themes/dark_theme/branch_closed.png b/zeiterfassungclient/themes/dark_theme/branch_closed.png similarity index 100% rename from zeiterfassung/themes/dark_theme/branch_closed.png rename to zeiterfassungclient/themes/dark_theme/branch_closed.png diff --git a/zeiterfassung/themes/dark_theme/branch_open-on.png b/zeiterfassungclient/themes/dark_theme/branch_open-on.png similarity index 100% rename from zeiterfassung/themes/dark_theme/branch_open-on.png rename to zeiterfassungclient/themes/dark_theme/branch_open-on.png diff --git a/zeiterfassung/themes/dark_theme/branch_open.png b/zeiterfassungclient/themes/dark_theme/branch_open.png similarity index 100% rename from zeiterfassung/themes/dark_theme/branch_open.png rename to zeiterfassungclient/themes/dark_theme/branch_open.png diff --git a/zeiterfassung/themes/dark_theme/checkbox_checked.png b/zeiterfassungclient/themes/dark_theme/checkbox_checked.png similarity index 100% rename from zeiterfassung/themes/dark_theme/checkbox_checked.png rename to zeiterfassungclient/themes/dark_theme/checkbox_checked.png diff --git a/zeiterfassung/themes/dark_theme/checkbox_checked_disabled.png b/zeiterfassungclient/themes/dark_theme/checkbox_checked_disabled.png similarity index 100% rename from zeiterfassung/themes/dark_theme/checkbox_checked_disabled.png rename to zeiterfassungclient/themes/dark_theme/checkbox_checked_disabled.png diff --git a/zeiterfassung/themes/dark_theme/checkbox_checked_focus.png b/zeiterfassungclient/themes/dark_theme/checkbox_checked_focus.png similarity index 100% rename from zeiterfassung/themes/dark_theme/checkbox_checked_focus.png rename to zeiterfassungclient/themes/dark_theme/checkbox_checked_focus.png diff --git a/zeiterfassung/themes/dark_theme/checkbox_indeterminate.png b/zeiterfassungclient/themes/dark_theme/checkbox_indeterminate.png similarity index 100% rename from zeiterfassung/themes/dark_theme/checkbox_indeterminate.png rename to zeiterfassungclient/themes/dark_theme/checkbox_indeterminate.png diff --git a/zeiterfassung/themes/dark_theme/checkbox_indeterminate_disabled.png b/zeiterfassungclient/themes/dark_theme/checkbox_indeterminate_disabled.png similarity index 100% rename from zeiterfassung/themes/dark_theme/checkbox_indeterminate_disabled.png rename to zeiterfassungclient/themes/dark_theme/checkbox_indeterminate_disabled.png diff --git a/zeiterfassung/themes/dark_theme/checkbox_indeterminate_focus.png b/zeiterfassungclient/themes/dark_theme/checkbox_indeterminate_focus.png similarity index 100% rename from zeiterfassung/themes/dark_theme/checkbox_indeterminate_focus.png rename to zeiterfassungclient/themes/dark_theme/checkbox_indeterminate_focus.png diff --git a/zeiterfassung/themes/dark_theme/checkbox_unchecked.png b/zeiterfassungclient/themes/dark_theme/checkbox_unchecked.png similarity index 100% rename from zeiterfassung/themes/dark_theme/checkbox_unchecked.png rename to zeiterfassungclient/themes/dark_theme/checkbox_unchecked.png diff --git a/zeiterfassung/themes/dark_theme/checkbox_unchecked_disabled.png b/zeiterfassungclient/themes/dark_theme/checkbox_unchecked_disabled.png similarity index 100% rename from zeiterfassung/themes/dark_theme/checkbox_unchecked_disabled.png rename to zeiterfassungclient/themes/dark_theme/checkbox_unchecked_disabled.png diff --git a/zeiterfassung/themes/dark_theme/checkbox_unchecked_focus.png b/zeiterfassungclient/themes/dark_theme/checkbox_unchecked_focus.png similarity index 100% rename from zeiterfassung/themes/dark_theme/checkbox_unchecked_focus.png rename to zeiterfassungclient/themes/dark_theme/checkbox_unchecked_focus.png diff --git a/zeiterfassung/themes/dark_theme/close-hover.png b/zeiterfassungclient/themes/dark_theme/close-hover.png similarity index 100% rename from zeiterfassung/themes/dark_theme/close-hover.png rename to zeiterfassungclient/themes/dark_theme/close-hover.png diff --git a/zeiterfassung/themes/dark_theme/close-pressed.png b/zeiterfassungclient/themes/dark_theme/close-pressed.png similarity index 100% rename from zeiterfassung/themes/dark_theme/close-pressed.png rename to zeiterfassungclient/themes/dark_theme/close-pressed.png diff --git a/zeiterfassung/themes/dark_theme/close.png b/zeiterfassungclient/themes/dark_theme/close.png similarity index 100% rename from zeiterfassung/themes/dark_theme/close.png rename to zeiterfassungclient/themes/dark_theme/close.png diff --git a/zeiterfassung/themes/dark_theme/down_arrow.png b/zeiterfassungclient/themes/dark_theme/down_arrow.png similarity index 100% rename from zeiterfassung/themes/dark_theme/down_arrow.png rename to zeiterfassungclient/themes/dark_theme/down_arrow.png diff --git a/zeiterfassung/themes/dark_theme/down_arrow_disabled.png b/zeiterfassungclient/themes/dark_theme/down_arrow_disabled.png similarity index 100% rename from zeiterfassung/themes/dark_theme/down_arrow_disabled.png rename to zeiterfassungclient/themes/dark_theme/down_arrow_disabled.png diff --git a/zeiterfassung/themes/dark_theme/left_arrow.png b/zeiterfassungclient/themes/dark_theme/left_arrow.png similarity index 100% rename from zeiterfassung/themes/dark_theme/left_arrow.png rename to zeiterfassungclient/themes/dark_theme/left_arrow.png diff --git a/zeiterfassung/themes/dark_theme/left_arrow_disabled.png b/zeiterfassungclient/themes/dark_theme/left_arrow_disabled.png similarity index 100% rename from zeiterfassung/themes/dark_theme/left_arrow_disabled.png rename to zeiterfassungclient/themes/dark_theme/left_arrow_disabled.png diff --git a/zeiterfassung/themes/dark_theme/radio_checked.png b/zeiterfassungclient/themes/dark_theme/radio_checked.png similarity index 100% rename from zeiterfassung/themes/dark_theme/radio_checked.png rename to zeiterfassungclient/themes/dark_theme/radio_checked.png diff --git a/zeiterfassung/themes/dark_theme/radio_checked_disabled.png b/zeiterfassungclient/themes/dark_theme/radio_checked_disabled.png similarity index 100% rename from zeiterfassung/themes/dark_theme/radio_checked_disabled.png rename to zeiterfassungclient/themes/dark_theme/radio_checked_disabled.png diff --git a/zeiterfassung/themes/dark_theme/radio_checked_focus.png b/zeiterfassungclient/themes/dark_theme/radio_checked_focus.png similarity index 100% rename from zeiterfassung/themes/dark_theme/radio_checked_focus.png rename to zeiterfassungclient/themes/dark_theme/radio_checked_focus.png diff --git a/zeiterfassung/themes/dark_theme/radio_unchecked.png b/zeiterfassungclient/themes/dark_theme/radio_unchecked.png similarity index 100% rename from zeiterfassung/themes/dark_theme/radio_unchecked.png rename to zeiterfassungclient/themes/dark_theme/radio_unchecked.png diff --git a/zeiterfassung/themes/dark_theme/radio_unchecked_disabled.png b/zeiterfassungclient/themes/dark_theme/radio_unchecked_disabled.png similarity index 100% rename from zeiterfassung/themes/dark_theme/radio_unchecked_disabled.png rename to zeiterfassungclient/themes/dark_theme/radio_unchecked_disabled.png diff --git a/zeiterfassung/themes/dark_theme/radio_unchecked_focus.png b/zeiterfassungclient/themes/dark_theme/radio_unchecked_focus.png similarity index 100% rename from zeiterfassung/themes/dark_theme/radio_unchecked_focus.png rename to zeiterfassungclient/themes/dark_theme/radio_unchecked_focus.png diff --git a/zeiterfassung/themes/dark_theme/right_arrow.png b/zeiterfassungclient/themes/dark_theme/right_arrow.png similarity index 100% rename from zeiterfassung/themes/dark_theme/right_arrow.png rename to zeiterfassungclient/themes/dark_theme/right_arrow.png diff --git a/zeiterfassung/themes/dark_theme/right_arrow_disabled.png b/zeiterfassungclient/themes/dark_theme/right_arrow_disabled.png similarity index 100% rename from zeiterfassung/themes/dark_theme/right_arrow_disabled.png rename to zeiterfassungclient/themes/dark_theme/right_arrow_disabled.png diff --git a/zeiterfassung/themes/dark_theme/sizegrip.png b/zeiterfassungclient/themes/dark_theme/sizegrip.png similarity index 100% rename from zeiterfassung/themes/dark_theme/sizegrip.png rename to zeiterfassungclient/themes/dark_theme/sizegrip.png diff --git a/zeiterfassung/themes/dark_theme/stylesheet-branch-end.png b/zeiterfassungclient/themes/dark_theme/stylesheet-branch-end.png similarity index 100% rename from zeiterfassung/themes/dark_theme/stylesheet-branch-end.png rename to zeiterfassungclient/themes/dark_theme/stylesheet-branch-end.png diff --git a/zeiterfassung/themes/dark_theme/stylesheet-branch-more.png b/zeiterfassungclient/themes/dark_theme/stylesheet-branch-more.png similarity index 100% rename from zeiterfassung/themes/dark_theme/stylesheet-branch-more.png rename to zeiterfassungclient/themes/dark_theme/stylesheet-branch-more.png diff --git a/zeiterfassung/themes/dark_theme/stylesheet-vline.png b/zeiterfassungclient/themes/dark_theme/stylesheet-vline.png similarity index 100% rename from zeiterfassung/themes/dark_theme/stylesheet-vline.png rename to zeiterfassungclient/themes/dark_theme/stylesheet-vline.png diff --git a/zeiterfassung/themes/dark_theme/transparent.png b/zeiterfassungclient/themes/dark_theme/transparent.png similarity index 100% rename from zeiterfassung/themes/dark_theme/transparent.png rename to zeiterfassungclient/themes/dark_theme/transparent.png diff --git a/zeiterfassung/themes/dark_theme/undock.png b/zeiterfassungclient/themes/dark_theme/undock.png similarity index 100% rename from zeiterfassung/themes/dark_theme/undock.png rename to zeiterfassungclient/themes/dark_theme/undock.png diff --git a/zeiterfassung/themes/dark_theme/up_arrow.png b/zeiterfassungclient/themes/dark_theme/up_arrow.png similarity index 100% rename from zeiterfassung/themes/dark_theme/up_arrow.png rename to zeiterfassungclient/themes/dark_theme/up_arrow.png diff --git a/zeiterfassung/themes/dark_theme/up_arrow_disabled.png b/zeiterfassungclient/themes/dark_theme/up_arrow_disabled.png similarity index 100% rename from zeiterfassung/themes/dark_theme/up_arrow_disabled.png rename to zeiterfassungclient/themes/dark_theme/up_arrow_disabled.png diff --git a/zeiterfassung/translations/zeiterfassung_de.ts b/zeiterfassungclient/translations/zeiterfassung_de.ts similarity index 100% rename from zeiterfassung/translations/zeiterfassung_de.ts rename to zeiterfassungclient/translations/zeiterfassung_de.ts diff --git a/zeiterfassung/translations/zeiterfassung_en.ts b/zeiterfassungclient/translations/zeiterfassung_en.ts similarity index 100% rename from zeiterfassung/translations/zeiterfassung_en.ts rename to zeiterfassungclient/translations/zeiterfassung_en.ts diff --git a/zeiterfassung/zeiterfassung_resources.qrc b/zeiterfassungclient/zeiterfassung_resources.qrc similarity index 100% rename from zeiterfassung/zeiterfassung_resources.qrc rename to zeiterfassungclient/zeiterfassung_resources.qrc diff --git a/zeiterfassung/zeiterfassung.pro b/zeiterfassungclient/zeiterfassungclient.pro similarity index 100% rename from zeiterfassung/zeiterfassung.pro rename to zeiterfassungclient/zeiterfassungclient.pro diff --git a/zeiterfassungcorelib/CMakeLists.txt b/zeiterfassungcorelib/CMakeLists.txt index 94f47e3..a1d52e8 100644 --- a/zeiterfassungcorelib/CMakeLists.txt +++ b/zeiterfassungcorelib/CMakeLists.txt @@ -14,3 +14,5 @@ target_compile_definitions(zeiterfassungcorelib PRIVATE ZEITERFASSUNGCORELIB_LIB target_link_libraries(zeiterfassungcorelib Qt5::Core dbcorelib) target_include_directories(zeiterfassungcorelib PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) + +add_dependencies(zeiterfassung zeiterfassungcorelib) diff --git a/zeiterfassungguilib/CMakeLists.txt b/zeiterfassungguilib/CMakeLists.txt index cf1d559..8aeff92 100644 --- a/zeiterfassungguilib/CMakeLists.txt +++ b/zeiterfassungguilib/CMakeLists.txt @@ -23,6 +23,10 @@ set(SOURCES dialogs/settingsdialog.cpp ) +set(RESOURCES + zeiterfassungguilib_resources.qrc +) + set(FORMS mainwindow.ui dialogs/authenticationdialog.ui @@ -30,10 +34,12 @@ set(FORMS dialogs/settingsdialog.ui ) -add_library(zeiterfassungguilib SHARED ${HEADERS} ${SOURCES} ${FORMS}) +add_library(zeiterfassungguilib SHARED ${HEADERS} ${SOURCES} ${RESOURCES} ${FORMS}) target_compile_definitions(zeiterfassungguilib PRIVATE ZEITERFASSUNGGUILIB_LIBRARY) target_link_libraries(zeiterfassungguilib Qt5::Core Qt5::Gui Qt5::Widgets Qt5::UiTools zeiterfassungcorelib zeiterfassungnetworklib) target_include_directories(zeiterfassungguilib PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) + +add_dependencies(zeiterfassung zeiterfassungguilib) diff --git a/zeiterfassungnetworklib/CMakeLists.txt b/zeiterfassungnetworklib/CMakeLists.txt index 760b3f6..200c15a 100644 --- a/zeiterfassungnetworklib/CMakeLists.txt +++ b/zeiterfassungnetworklib/CMakeLists.txt @@ -48,3 +48,5 @@ target_compile_definitions(zeiterfassungnetworklib PRIVATE ZEITERFASSUNGNETWORKL target_link_libraries(zeiterfassungnetworklib Qt5::Core Qt5::Network dbcorelib) target_include_directories(zeiterfassungnetworklib PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) + +add_dependencies(zeiterfassung zeiterfassungnetworklib)