From 017b86d4705f1d8339c00fd373f86e10e04c3c11 Mon Sep 17 00:00:00 2001 From: Daniel Brunner <0xFEEDC0DE64@gmail.com> Date: Tue, 16 Oct 2018 23:04:49 +0200 Subject: [PATCH] Bumped projects and lowered minimum required version --- CMakeLists.txt | 17 ++++++++++++++--- DbSerialServer | 2 +- DbSketch | 2 +- DbWebserver | 2 +- DbZeiterfassung | 2 +- libs/DbCoreLib | 2 +- libs/DbGuiLib | 2 +- libs/DbNetworkLib | 2 +- 8 files changed, 21 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d954327..fa33a5b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.12) +cmake_minimum_required(VERSION 2.8.11) project(DbSoftware) set(CMAKE_CXX_STANDARD 14) @@ -25,6 +25,15 @@ find_package(Qt5SerialPort CONFIG REQUIRED) find_package(Qt5Multimedia CONFIG REQUIRED) find_package(Qt5Test CONFIG REQUIRED) find_package(Qt5UiTools CONFIG REQUIRED) +find_package(Qt5LinguistTools CONFIG REQUIRED) + +FUNCTION(PREPEND var prefix) + SET(listVar "") + FOREACH(f ${ARGN}) + LIST(APPEND listVar "${prefix}/${f}") + ENDFOREACH(f) + SET(${var} "${listVar}" PARENT_SCOPE) +ENDFUNCTION(PREPEND) add_subdirectory(3rdparty) add_subdirectory(DbDatabaseTree) @@ -64,8 +73,10 @@ execute_process(COMMAND ${QT_QMAKE_EXECUTABLE} -query QT_INSTALL_TRANSLATIONS OUTPUT_STRIP_TRAILING_WHITESPACE ) -list(TRANSFORM QT_TRANSLATIONS - PREPEND ${QT_INSTALL_TRANSLATIONS}/) +PREPEND(QT_TRANSLATIONS ${QT_INSTALL_TRANSLATIONS}/ ${QT_TRANSLATIONS}) + +#list(TRANSFORM QT_TRANSLATIONS +# PREPEND ${QT_INSTALL_TRANSLATIONS}/) file(COPY ${QT_TRANSLATIONS} DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/translations) diff --git a/DbSerialServer b/DbSerialServer index af841fb..d558814 160000 --- a/DbSerialServer +++ b/DbSerialServer @@ -1 +1 @@ -Subproject commit af841fbe051063a001214515ab2f494ba1b62825 +Subproject commit d5588147a13f39fc713e45cb04b22b3e0311cb2a diff --git a/DbSketch b/DbSketch index b3bdf7d..4e99ba3 160000 --- a/DbSketch +++ b/DbSketch @@ -1 +1 @@ -Subproject commit b3bdf7d823057ad70db5950b73b62eb81861d626 +Subproject commit 4e99ba3a05cb7c301e60e82696340edb83583511 diff --git a/DbWebserver b/DbWebserver index 72b287a..e370fe1 160000 --- a/DbWebserver +++ b/DbWebserver @@ -1 +1 @@ -Subproject commit 72b287adef687e91401510f7b629c76f269c00f9 +Subproject commit e370fe1eeae1df6b763a8970329bf05cb9632ae0 diff --git a/DbZeiterfassung b/DbZeiterfassung index 0f95bf3..2d3d972 160000 --- a/DbZeiterfassung +++ b/DbZeiterfassung @@ -1 +1 @@ -Subproject commit 0f95bf37d0d0bc854ccc5c137aa59721c22e6e1e +Subproject commit 2d3d9722d8eb34cbde964af94d817b315d693a51 diff --git a/libs/DbCoreLib b/libs/DbCoreLib index 2364fe5..312759a 160000 --- a/libs/DbCoreLib +++ b/libs/DbCoreLib @@ -1 +1 @@ -Subproject commit 2364fe5d991ca528b685ff39f2e67e15f71d5351 +Subproject commit 312759af4c343af8788c098cae72db5acfb00843 diff --git a/libs/DbGuiLib b/libs/DbGuiLib index 2b2bb57..e21b325 160000 --- a/libs/DbGuiLib +++ b/libs/DbGuiLib @@ -1 +1 @@ -Subproject commit 2b2bb578d8ca410a60be71f58f0b78e254027089 +Subproject commit e21b325a308beff7cc8b627d3e9099f2b95e45a2 diff --git a/libs/DbNetworkLib b/libs/DbNetworkLib index be07b36..c3249ee 160000 --- a/libs/DbNetworkLib +++ b/libs/DbNetworkLib @@ -1 +1 @@ -Subproject commit be07b36db7c89cf8d9441ab7986a9e6ddd94f3a1 +Subproject commit c3249ee62d323f985919a08fcf6ad2fc0c942f41