Fixed log context, qt translations, project bumps

This commit is contained in:
Daniel Brunner
2018-10-14 14:29:24 +02:00
parent 07484c6c58
commit 2eeaacd04c
4 changed files with 38 additions and 4 deletions

View File

@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.8.11) cmake_minimum_required(VERSION 3.12)
project(DbSoftware) project(DbSoftware)
set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD 14)
@@ -12,6 +12,10 @@ set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTOUIC ON) set(CMAKE_AUTOUIC ON)
set(CMAKE_AUTORCC ON) set(CMAKE_AUTORCC ON)
add_definitions(-DQT_DEPRECATED_WARNINGS)
add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000)
add_definitions(-DQT_MESSAGELOGCONTEXT)
find_package(Qt5Core CONFIG REQUIRED) find_package(Qt5Core CONFIG REQUIRED)
find_package(Qt5Gui CONFIG REQUIRED) find_package(Qt5Gui CONFIG REQUIRED)
find_package(Qt5Widgets CONFIG REQUIRED) find_package(Qt5Widgets CONFIG REQUIRED)
@@ -37,3 +41,33 @@ add_subdirectory(DbTictactoe)
add_subdirectory(DbWebserver) add_subdirectory(DbWebserver)
add_subdirectory(DbZeiterfassung) add_subdirectory(DbZeiterfassung)
add_subdirectory(libs) 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
)
message(QT_INSTALL_TRANSLATIONS: ${QT_INSTALL_TRANSLATIONS})
list(TRANSFORM QT_TRANSLATIONS
PREPEND ${QT_INSTALL_TRANSLATIONS}/)
file(COPY ${QT_TRANSLATIONS}
DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/translations)