From a14cd34ca12229f1668b90cfbb4f51e5a8d65e0a Mon Sep 17 00:00:00 2001 From: Daniel Brunner <0xFEEDC0DE64@gmail.com> Date: Sun, 7 Oct 2018 16:14:48 +0200 Subject: [PATCH] Converted some of the projects to cmake #1 --- 3rdparty/CMakeLists.txt | 1 + 3rdparty/Quazip | 2 +- CMakeLists.txt | 32 ++++++++++++++++++++++++++++++++ DbDatabaseTree | 2 +- DbHashCracker | 2 +- DbMessaging | 2 +- DbNeuralNet | 2 +- DbPathFinder | 2 +- DbPicSync | 2 +- DbRadioDumper | 2 +- DbSerialServer | 2 +- libs/CMakeLists.txt | 4 ++++ libs/DbCoreLib | 2 +- libs/DbGuiLib | 2 +- libs/DbNetworkLib | 2 +- 15 files changed, 49 insertions(+), 12 deletions(-) create mode 100644 3rdparty/CMakeLists.txt create mode 100644 CMakeLists.txt create mode 100644 libs/CMakeLists.txt diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt new file mode 100644 index 0000000..1b644a1 --- /dev/null +++ b/3rdparty/CMakeLists.txt @@ -0,0 +1 @@ +add_subdirectory(Quazip) diff --git a/3rdparty/Quazip b/3rdparty/Quazip index 6277b9f..3b65193 160000 --- a/3rdparty/Quazip +++ b/3rdparty/Quazip @@ -1 +1 @@ -Subproject commit 6277b9f46fab14f30b247868174a688a5e81218a +Subproject commit 3b651930878645601d2a17440bab06ac02bf83db diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..8a15bb1 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,32 @@ +cmake_minimum_required(VERSION 2.8.11) +project(DbSoftware) + +set(CMAKE_CXX_STANDARD 14) + +set(CMAKE_INCLUDE_CURRENT_DIR ON) +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTOUIC ON) + +find_package(Qt5Core CONFIG REQUIRED) +find_package(Qt5Gui CONFIG REQUIRED) +find_package(Qt5Widgets CONFIG REQUIRED) +find_package(Qt5Network CONFIG REQUIRED) +find_package(Qt5Sql CONFIG REQUIRED) +find_package(Qt5SerialPort CONFIG REQUIRED) +find_package(Qt5Test CONFIG REQUIRED) + +add_subdirectory(3rdparty) +add_subdirectory(DbDatabaseTree) +add_subdirectory(DbHashCracker) +add_subdirectory(DbMessaging) +add_subdirectory(DbNeuralNet) +add_subdirectory(DbPathFinder) +add_subdirectory(DbPicSync) +add_subdirectory(DbRadioDumper) +add_subdirectory(DbSerialServer) +add_subdirectory(DbSketch) +add_subdirectory(DbTernaryClock) +add_subdirectory(DbTictactoe) +add_subdirectory(DbWebserver) +add_subdirectory(DbZeiterfassung) +add_subdirectory(libs) diff --git a/DbDatabaseTree b/DbDatabaseTree index 913c723..e8ed1ea 160000 --- a/DbDatabaseTree +++ b/DbDatabaseTree @@ -1 +1 @@ -Subproject commit 913c72344293f1cadb053f8f4c0447b5273aeb2c +Subproject commit e8ed1ea24611f53d631afb6e21dd168f850a6445 diff --git a/DbHashCracker b/DbHashCracker index 3622d03..1fe1f20 160000 --- a/DbHashCracker +++ b/DbHashCracker @@ -1 +1 @@ -Subproject commit 3622d030dd28d1dd1e266ed6f9f2a60c83a68055 +Subproject commit 1fe1f20bda8347db77873225b6842f7539cb69ff diff --git a/DbMessaging b/DbMessaging index afb0b7a..7d27b0f 160000 --- a/DbMessaging +++ b/DbMessaging @@ -1 +1 @@ -Subproject commit afb0b7a2e52eebaf3a782499613ca73000ed2e53 +Subproject commit 7d27b0f27450d60cdcdd9009018448b56f8febfd diff --git a/DbNeuralNet b/DbNeuralNet index 80e3f83..5f9d1ee 160000 --- a/DbNeuralNet +++ b/DbNeuralNet @@ -1 +1 @@ -Subproject commit 80e3f83c122d93f3f5c1b408287274368e3bfab5 +Subproject commit 5f9d1eef27d257182302210f1e1e9ae020b75259 diff --git a/DbPathFinder b/DbPathFinder index b72882f..8f1e86f 160000 --- a/DbPathFinder +++ b/DbPathFinder @@ -1 +1 @@ -Subproject commit b72882f2306d85fc37e625b39306105ffb95b654 +Subproject commit 8f1e86f69b0c720b14298aaef4069e1327b313e4 diff --git a/DbPicSync b/DbPicSync index ce6769e..7c9c8c8 160000 --- a/DbPicSync +++ b/DbPicSync @@ -1 +1 @@ -Subproject commit ce6769e8ff59d05655f52345338b0ba3bc320d7b +Subproject commit 7c9c8c8f2dc8384333c82d4750fad435e8b65393 diff --git a/DbRadioDumper b/DbRadioDumper index 9813739..ab89ba1 160000 --- a/DbRadioDumper +++ b/DbRadioDumper @@ -1 +1 @@ -Subproject commit 9813739e94d92b2dfafa847c9db7905bbc905b4e +Subproject commit ab89ba131dc1126889f6ad461858f51fe9fab283 diff --git a/DbSerialServer b/DbSerialServer index cb231f6..267ec95 160000 --- a/DbSerialServer +++ b/DbSerialServer @@ -1 +1 @@ -Subproject commit cb231f63cecd5589b863ba3515270174b773e73e +Subproject commit 267ec959d40b63315c5209511957dc473f5f34ef diff --git a/libs/CMakeLists.txt b/libs/CMakeLists.txt new file mode 100644 index 0000000..17bd312 --- /dev/null +++ b/libs/CMakeLists.txt @@ -0,0 +1,4 @@ +add_subdirectory(DbCoreLib) +add_subdirectory(DbNetworkLib) +add_subdirectory(DbGuiLib) +add_subdirectory(unittests) diff --git a/libs/DbCoreLib b/libs/DbCoreLib index 8f35d6d..338674d 160000 --- a/libs/DbCoreLib +++ b/libs/DbCoreLib @@ -1 +1 @@ -Subproject commit 8f35d6d3a961957fe4e6ac428a1c19270e519cb5 +Subproject commit 338674dcf5d9d6a5a2f3985ec8b8c67e83e9198a diff --git a/libs/DbGuiLib b/libs/DbGuiLib index e037084..2192aa8 160000 --- a/libs/DbGuiLib +++ b/libs/DbGuiLib @@ -1 +1 @@ -Subproject commit e0370844700f8a1af3fa6c90e02293c307c78ae1 +Subproject commit 2192aa84d3e1e8582dc1736509c5431296f8054a diff --git a/libs/DbNetworkLib b/libs/DbNetworkLib index ad8a80a..23c6166 160000 --- a/libs/DbNetworkLib +++ b/libs/DbNetworkLib @@ -1 +1 @@ -Subproject commit ad8a80ac9b2b50ea37c5ff43eb14f5aa433e8582 +Subproject commit 23c6166b8daa6fcb32153ab51c976efe54999720