Fixed cmake build folder and bumped packages

This commit is contained in:
Daniel Brunner committed 2018-10-07 22:22:42 +02:00
1 parent a14cd34ca1
commit 9de91ebc8d
13 files changed
+18 -13

No files matched your search

+1 -1
+7 -1
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)
Submodule DbSketch updated: 8ff2754dd3...3a8ec089a0.
-1
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)