diff --git a/3rdparty/Quazip b/3rdparty/Quazip index 3b65193..edbb806 160000 --- a/3rdparty/Quazip +++ b/3rdparty/Quazip @@ -1 +1 @@ -Subproject commit 3b651930878645601d2a17440bab06ac02bf83db +Subproject commit edbb8063373de891b24d1e9c38b0cff619ddddfd diff --git a/CMakeLists.txt b/CMakeLists.txt index 8a15bb1..83e1417 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,8 +2,12 @@ cmake_minimum_required(VERSION 2.8.11) project(DbSoftware) set(CMAKE_CXX_STANDARD 14) - set(CMAKE_INCLUDE_CURRENT_DIR ON) + +set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) +set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) + set(CMAKE_AUTOMOC ON) set(CMAKE_AUTOUIC ON) @@ -13,7 +17,9 @@ find_package(Qt5Widgets CONFIG REQUIRED) find_package(Qt5Network CONFIG REQUIRED) find_package(Qt5Sql CONFIG REQUIRED) find_package(Qt5SerialPort CONFIG REQUIRED) +find_package(Qt5Multimedia CONFIG REQUIRED) find_package(Qt5Test CONFIG REQUIRED) +find_package(Qt5UiTools CONFIG REQUIRED) add_subdirectory(3rdparty) add_subdirectory(DbDatabaseTree) diff --git a/DbMessaging b/DbMessaging index 7d27b0f..9ffddac 160000 --- a/DbMessaging +++ b/DbMessaging @@ -1 +1 @@ -Subproject commit 7d27b0f27450d60cdcdd9009018448b56f8febfd +Subproject commit 9ffddace1cdab25528d75352cec0ce469081e950 diff --git a/DbNeuralNet b/DbNeuralNet index 5f9d1ee..646c25e 160000 --- a/DbNeuralNet +++ b/DbNeuralNet @@ -1 +1 @@ -Subproject commit 5f9d1eef27d257182302210f1e1e9ae020b75259 +Subproject commit 646c25e41ee7d4433b6a1cfc33033a9d9bff3c67 diff --git a/DbPathFinder b/DbPathFinder index 8f1e86f..ca60392 160000 --- a/DbPathFinder +++ b/DbPathFinder @@ -1 +1 @@ -Subproject commit 8f1e86f69b0c720b14298aaef4069e1327b313e4 +Subproject commit ca6039206d9596c37037f5192d3f6190fc41fdbb diff --git a/DbSketch b/DbSketch index 8ff2754..3a8ec08 160000 --- a/DbSketch +++ b/DbSketch @@ -1 +1 @@ -Subproject commit 8ff2754dd300c34b2f06dca484edc27d2ca565a1 +Subproject commit 3a8ec089a0d47264899cc4439828f90c901a66e5 diff --git a/DbTernaryClock b/DbTernaryClock index 4ca57e5..d4ad225 160000 --- a/DbTernaryClock +++ b/DbTernaryClock @@ -1 +1 @@ -Subproject commit 4ca57e59d253233c84dd6edf510307777f392aac +Subproject commit d4ad225d33d5455b692f7c55c893dfea551930e5 diff --git a/DbTictactoe b/DbTictactoe index b8a0011..2d12fa3 160000 --- a/DbTictactoe +++ b/DbTictactoe @@ -1 +1 @@ -Subproject commit b8a00116957c98e12fbe1e3a2f2793d94d648ff4 +Subproject commit 2d12fa3d6d3fc0054ccae6a25859373f2c9c7f1e diff --git a/DbZeiterfassung b/DbZeiterfassung index c5d8110..1ab6ccd 160000 --- a/DbZeiterfassung +++ b/DbZeiterfassung @@ -1 +1 @@ -Subproject commit c5d8110f56f8543a9f79bef1e0c35576d586984d +Subproject commit 1ab6ccdafcc28f9b9939280e80591f1477b1d3bb diff --git a/libs/CMakeLists.txt b/libs/CMakeLists.txt index 17bd312..5f80c48 100644 --- a/libs/CMakeLists.txt +++ b/libs/CMakeLists.txt @@ -1,4 +1,3 @@ add_subdirectory(DbCoreLib) add_subdirectory(DbNetworkLib) add_subdirectory(DbGuiLib) -add_subdirectory(unittests) diff --git a/libs/DbCoreLib b/libs/DbCoreLib index 338674d..49b7ffa 160000 --- a/libs/DbCoreLib +++ b/libs/DbCoreLib @@ -1 +1 @@ -Subproject commit 338674dcf5d9d6a5a2f3985ec8b8c67e83e9198a +Subproject commit 49b7ffa65623047594027c0ecc3159c6fc19f8fb diff --git a/libs/DbGuiLib b/libs/DbGuiLib index 2192aa8..f7b32fe 160000 --- a/libs/DbGuiLib +++ b/libs/DbGuiLib @@ -1 +1 @@ -Subproject commit 2192aa84d3e1e8582dc1736509c5431296f8054a +Subproject commit f7b32fe42cdddd286c6e3a0ff01be44ec7488182 diff --git a/libs/DbNetworkLib b/libs/DbNetworkLib index 23c6166..05bcd10 160000 --- a/libs/DbNetworkLib +++ b/libs/DbNetworkLib @@ -1 +1 @@ -Subproject commit 23c6166b8daa6fcb32153ab51c976efe54999720 +Subproject commit 05bcd106b7074df261502e551817d7512a7fc174