feedc0de/DbSoftware
1
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed cmake build folder and bumped packages

Browse Source
This commit is contained in:
Daniel Brunner
2018-10-07 22:22:42 +02:00
parent a14cd34ca1
commit 9de91ebc8d
13 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
3rdparty/Quazip vendored

Submodule 3rdparty/Quazip updated: 3b65193087...edbb806337

8
CMakeLists.txt
View File

@@ -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)

2
DbMessaging

Submodule DbMessaging updated: 7d27b0f274...9ffddace1c

2
DbNeuralNet

Submodule DbNeuralNet updated: 5f9d1eef27...646c25e41e

2
DbPathFinder

Submodule DbPathFinder updated: 8f1e86f69b...ca6039206d

2
DbSketch

Submodule DbSketch updated: 8ff2754dd3...3a8ec089a0

2
DbTernaryClock

Submodule DbTernaryClock updated: 4ca57e59d2...d4ad225d33

2
DbTictactoe

Submodule DbTictactoe updated: b8a0011695...2d12fa3d6d

2
DbZeiterfassung

Submodule DbZeiterfassung updated: c5d8110f56...1ab6ccdafc

1
libs/CMakeLists.txt
View File

@@ -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)

2
libs/DbCoreLib

Submodule libs/DbCoreLib updated: 338674dcf5...49b7ffa656

2
libs/DbGuiLib

Submodule libs/DbGuiLib updated: 2192aa84d3...f7b32fe42c

2
libs/DbNetworkLib

Submodule libs/DbNetworkLib updated: 23c6166b8d...05bcd106b7