diff --git a/3rdparty/Quazip b/3rdparty/Quazip index 39b4a19..0b4d47d 160000 --- a/3rdparty/Quazip +++ b/3rdparty/Quazip @@ -1 +1 @@ -Subproject commit 39b4a19c88da85cf408171fb0b82ded41122aa2e +Subproject commit 0b4d47d346202f80b772c4a4b60b5d6f88220554 diff --git a/CMakeLists.txt b/CMakeLists.txt index d1a5c1b..876188d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/DbDatabaseTree b/DbDatabaseTree index ca75e3c..9e85379 160000 --- a/DbDatabaseTree +++ b/DbDatabaseTree @@ -1 +1 @@ -Subproject commit ca75e3c439a8b431caaa5e32b903068a8ae83d39 +Subproject commit 9e8537969a713bed28e7d9d4586de6195168c5cd diff --git a/DbHashCracker b/DbHashCracker index 1fe1f20..2e3951b 160000 --- a/DbHashCracker +++ b/DbHashCracker @@ -1 +1 @@ -Subproject commit 1fe1f20bda8347db77873225b6842f7539cb69ff +Subproject commit 2e3951b82e924310c32a2c9095022210e1bc1fc0 diff --git a/DbMessaging b/DbMessaging index 1d28d78..1485fa7 160000 --- a/DbMessaging +++ b/DbMessaging @@ -1 +1 @@ -Subproject commit 1d28d78833eca0dfbdecae35618c52d77b4f4ee0 +Subproject commit 1485fa7a4f43461c322eebc89e11749c5cdd7a8e diff --git a/DbNeuralNet b/DbNeuralNet index 6013d9a..ac67fbc 160000 --- a/DbNeuralNet +++ b/DbNeuralNet @@ -1 +1 @@ -Subproject commit 6013d9a50cd1a4da7660fd77c2e3a860f4bef879 +Subproject commit ac67fbcf77a1952ae6974b0806453de19061c9af diff --git a/DbPathFinder b/DbPathFinder index ca60392..9236d74 160000 --- a/DbPathFinder +++ b/DbPathFinder @@ -1 +1 @@ -Subproject commit ca6039206d9596c37037f5192d3f6190fc41fdbb +Subproject commit 9236d74846af00451d2f3b5acb2e13078c43ce8a diff --git a/DbPicSync b/DbPicSync index 73ff038..e00dfd4 160000 --- a/DbPicSync +++ b/DbPicSync @@ -1 +1 @@ -Subproject commit 73ff038e2c7b30ba16ae5350690acc67ed960670 +Subproject commit e00dfd4cabbf922ba835a9175ea6b743c44117fa diff --git a/DbRadioDumper b/DbRadioDumper index ab89ba1..b3651f4 160000 --- a/DbRadioDumper +++ b/DbRadioDumper @@ -1 +1 @@ -Subproject commit ab89ba131dc1126889f6ad461858f51fe9fab283 +Subproject commit b3651f491a1d04f7016d76d8189f4b2f35f43797 diff --git a/DbSerialServer b/DbSerialServer index d558814..58853bd 160000 --- a/DbSerialServer +++ b/DbSerialServer @@ -1 +1 @@ -Subproject commit d5588147a13f39fc713e45cb04b22b3e0311cb2a +Subproject commit 58853bd331f3b877d32b057b500756911d6dac8d diff --git a/DbSketch b/DbSketch index 4e99ba3..72348a7 160000 --- a/DbSketch +++ b/DbSketch @@ -1 +1 @@ -Subproject commit 4e99ba3a05cb7c301e60e82696340edb83583511 +Subproject commit 72348a77eced3cf3b00c65bb9c2c8c4b80984548 diff --git a/DbTernaryClock b/DbTernaryClock index d4ad225..729b5e3 160000 --- a/DbTernaryClock +++ b/DbTernaryClock @@ -1 +1 @@ -Subproject commit d4ad225d33d5455b692f7c55c893dfea551930e5 +Subproject commit 729b5e3606b7a93e6c79f59ac4bcaf5e84196dbb diff --git a/DbTictactoe b/DbTictactoe index 2d12fa3..9e10794 160000 --- a/DbTictactoe +++ b/DbTictactoe @@ -1 +1 @@ -Subproject commit 2d12fa3d6d3fc0054ccae6a25859373f2c9c7f1e +Subproject commit 9e10794faf6ca53783e78a8995e4eb733436f094 diff --git a/translationhelper.cmake b/translationhelper.cmake new file mode 100644 index 0000000..3114db9 --- /dev/null +++ b/translationhelper.cmake @@ -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)