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

Bumped projects

Browse Source
This commit is contained in:
Daniel Brunner
2018-12-16 20:21:40 +01:00
parent f3d397e72b
commit 78cfa9c87d
14 changed files with 46 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
3rdparty/Quazip vendored

Submodule 3rdparty/Quazip updated: 39b4a19c88...0b4d47d346

44
CMakeLists.txt
View File

@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 2.8.11)
project(DbSoftware)
set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
@@ -16,17 +16,7 @@ add_definitions(-DQT_DEPRECATED_WARNINGS)
add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000)
add_definitions(-DQT_MESSAGELOGCONTEXT)
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(Qt5Multimedia CONFIG REQUIRED)
find_package(Qt5Test CONFIG REQUIRED)
find_package(Qt5UiTools CONFIG REQUIRED)
find_package(Qt5LinguistTools CONFIG REQUIRED)
# "backported" newer cmake feature: list(TRANSFORM xxx PREPEND xxx)
FUNCTION(PREPEND var prefix)
SET(listVar "")
FOREACH(f ${ARGN})
@@ -57,32 +47,4 @@ optional_add_subdirectory(DbWebserver)
optional_add_subdirectory(DbZeiterfassung)
add_subdirectory(libs)
set(QT_TRANSLATIONS
qt_en.qm
qtbase_en.qm
qtmultimedia_en.qm
qtquick1_en.qm
qtscript_en.qm
qtxmlpatterns_en.qm
qt_de.qm
qtbase_de.qm
qtmultimedia_de.qm
qtquick1_de.qm
qtscript_de.qm
qtxmlpatterns_de.qm
)
get_target_property(QT_QMAKE_EXECUTABLE Qt5::qmake IMPORTED_LOCATION)
execute_process(COMMAND ${QT_QMAKE_EXECUTABLE} -query QT_INSTALL_TRANSLATIONS
OUTPUT_VARIABLE QT_INSTALL_TRANSLATIONS
OUTPUT_STRIP_TRAILING_WHITESPACE
)
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)
include(${CMAKE_CURRENT_SOURCE_DIR}/translationhelper.cmake)

2
DbDatabaseTree

Submodule DbDatabaseTree updated: ca75e3c439...9e8537969a

2
DbHashCracker

Submodule DbHashCracker updated: 1fe1f20bda...2e3951b82e

2
DbMessaging

Submodule DbMessaging updated: 1d28d78833...1485fa7a4f

2
DbNeuralNet

Submodule DbNeuralNet updated: 6013d9a50c...ac67fbcf77

2
DbPathFinder

Submodule DbPathFinder updated: ca6039206d...9236d74846

2
DbPicSync

Submodule DbPicSync updated: 73ff038e2c...e00dfd4cab

2
DbRadioDumper

Submodule DbRadioDumper updated: ab89ba131d...b3651f491a

2
DbSerialServer

Submodule DbSerialServer updated: d5588147a1...58853bd331

2
DbSketch

Submodule DbSketch updated: 4e99ba3a05...72348a77ec

2
DbTernaryClock

Submodule DbTernaryClock updated: d4ad225d33...729b5e3606

2
DbTictactoe

Submodule DbTictactoe updated: 2d12fa3d6d...9e10794faf

31
translationhelper.cmake Normal file
View File

@@ -0,0 +1,31 @@
find_package(Qt5Core CONFIG REQUIRED)
set(QT_TRANSLATIONS
qt_en.qm
qtbase_en.qm
qtmultimedia_en.qm
qtquick1_en.qm
qtscript_en.qm
qtxmlpatterns_en.qm
qt_de.qm
qtbase_de.qm
qtmultimedia_de.qm
qtquick1_de.qm
qtscript_de.qm
qtxmlpatterns_de.qm
)
get_target_property(QT_QMAKE_EXECUTABLE Qt5::qmake IMPORTED_LOCATION)
execute_process(COMMAND ${QT_QMAKE_EXECUTABLE} -query QT_INSTALL_TRANSLATIONS
OUTPUT_VARIABLE QT_INSTALL_TRANSLATIONS
OUTPUT_STRIP_TRAILING_WHITESPACE
)
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)