Fixed cmake build folder and bumped packages
This commit is contained in:
1 parent
a14cd34ca1
commit
9de91ebc8d
13 files changed
+18
-13
No files matched your search
Vendored
+1
-1
Submodule 3rdparty/Quazip updated: 3b65193087...edbb806337.
+7
-1
@@ -2,8 +2,12 @@ cmake_minimum_required(VERSION 2.8.11)
|
|||||||
project(DbSoftware)
|
project(DbSoftware)
|
||||||
|
|
||||||
set(CMAKE_CXX_STANDARD 14)
|
set(CMAKE_CXX_STANDARD 14)
|
||||||
|
|
||||||
set(CMAKE_INCLUDE_CURRENT_DIR ON)
|
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_AUTOMOC ON)
|
||||||
set(CMAKE_AUTOUIC ON)
|
set(CMAKE_AUTOUIC ON)
|
||||||
|
|
||||||
@@ -13,7 +17,9 @@ find_package(Qt5Widgets CONFIG REQUIRED)
|
|||||||
find_package(Qt5Network CONFIG REQUIRED)
|
find_package(Qt5Network CONFIG REQUIRED)
|
||||||
find_package(Qt5Sql CONFIG REQUIRED)
|
find_package(Qt5Sql CONFIG REQUIRED)
|
||||||
find_package(Qt5SerialPort CONFIG REQUIRED)
|
find_package(Qt5SerialPort CONFIG REQUIRED)
|
||||||
|
find_package(Qt5Multimedia CONFIG REQUIRED)
|
||||||
find_package(Qt5Test CONFIG REQUIRED)
|
find_package(Qt5Test CONFIG REQUIRED)
|
||||||
|
find_package(Qt5UiTools CONFIG REQUIRED)
|
||||||
|
|
||||||
add_subdirectory(3rdparty)
|
add_subdirectory(3rdparty)
|
||||||
add_subdirectory(DbDatabaseTree)
|
add_subdirectory(DbDatabaseTree)
|
||||||
|
|||||||
+1
-1
Submodule DbMessaging updated: 7d27b0f274...9ffddace1c.
+1
-1
Submodule DbNeuralNet updated: 5f9d1eef27...646c25e41e.
+1
-1
Submodule DbPathFinder updated: 8f1e86f69b...ca6039206d.
+1
-1
Submodule DbSketch updated: 8ff2754dd3...3a8ec089a0.
+1
-1
Submodule DbTernaryClock updated: 4ca57e59d2...d4ad225d33.
+1
-1
Submodule DbTictactoe updated: b8a0011695...2d12fa3d6d.
+1
-1
Submodule DbZeiterfassung updated: c5d8110f56...1ab6ccdafc.
@@ -1,4 +1,3 @@
|
|||||||
add_subdirectory(DbCoreLib)
|
add_subdirectory(DbCoreLib)
|
||||||
add_subdirectory(DbNetworkLib)
|
add_subdirectory(DbNetworkLib)
|
||||||
add_subdirectory(DbGuiLib)
|
add_subdirectory(DbGuiLib)
|
||||||
add_subdirectory(unittests)
|
|
||||||
+1
-1
Submodule libs/DbCoreLib updated: 338674dcf5...49b7ffa656.
+1
-1
Submodule libs/DbGuiLib updated: 2192aa84d3...f7b32fe42c.
+1
-1
Submodule libs/DbNetworkLib updated: 23c6166b8d...05bcd106b7.
Reference in new issue
Block a user