From f11f6d6ded39175d915422da2bac6fb6ffc924f9 Mon Sep 17 00:00:00 2001 From: gregory guy Date: Sun, 29 Mar 2020 19:41:28 +0200 Subject: Conversion to the cmake building system. Added several man pages taken from the Debian packaging. Cleanup headers in ui files. Add png icons for mono theme. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: gregory guy cmake: - Use tde_add_check_executable instead of a combination of separate calls to tde_add_executable and add_test. - Simplify the detection of time.h and sys/time.h headers. - Refactor phrasebook files install, kmouth. Signed-off-by: Slávek Banko (cherry picked from commit 6b3181cf92f1fc74da1e8a82f690a1526cb4e900) --- kttsd/plugins/CMakeLists.txt | 6 +++ kttsd/plugins/command/CMakeLists.txt | 38 +++++++++++++++++ kttsd/plugins/command/commandconfwidget.ui | 6 --- kttsd/plugins/epos/CMakeLists.txt | 38 +++++++++++++++++ kttsd/plugins/epos/eposconfwidget.ui | 16 ++------ kttsd/plugins/festivalint/CMakeLists.txt | 48 ++++++++++++++++++++++ kttsd/plugins/festivalint/festivalintconfwidget.ui | 16 ++------ kttsd/plugins/flite/CMakeLists.txt | 38 +++++++++++++++++ kttsd/plugins/flite/fliteconfwidget.ui | 8 +--- kttsd/plugins/freetts/CMakeLists.txt | 37 +++++++++++++++++ kttsd/plugins/freetts/freettsconfigwidget.ui | 8 +--- kttsd/plugins/hadifix/CMakeLists.txt | 45 ++++++++++++++++++++ kttsd/plugins/hadifix/hadifixconfigui.ui | 20 +++------ kttsd/plugins/hadifix/voicefileui.ui | 9 ++-- 14 files changed, 270 insertions(+), 63 deletions(-) create mode 100644 kttsd/plugins/CMakeLists.txt create mode 100644 kttsd/plugins/command/CMakeLists.txt create mode 100644 kttsd/plugins/epos/CMakeLists.txt create mode 100644 kttsd/plugins/festivalint/CMakeLists.txt create mode 100644 kttsd/plugins/flite/CMakeLists.txt create mode 100644 kttsd/plugins/freetts/CMakeLists.txt create mode 100644 kttsd/plugins/hadifix/CMakeLists.txt (limited to 'kttsd/plugins') diff --git a/kttsd/plugins/CMakeLists.txt b/kttsd/plugins/CMakeLists.txt new file mode 100644 index 0000000..dc615ab --- /dev/null +++ b/kttsd/plugins/CMakeLists.txt @@ -0,0 +1,6 @@ +tde_conditional_add_subdirectory( BUILD_KTTSD_COMMAND command ) +tde_conditional_add_subdirectory( BUILD_KTTSD_EPOS epos ) +tde_conditional_add_subdirectory( BUILD_KTTSD_FESTIVAL festivalint ) +tde_conditional_add_subdirectory( BUILD_KTTSD_FREETTS freetts ) +tde_conditional_add_subdirectory( BUILD_KTTSD_FLITE flite ) +tde_conditional_add_subdirectory( BUILD_KTTSD_HADIFIX hadifix ) diff --git a/kttsd/plugins/command/CMakeLists.txt b/kttsd/plugins/command/CMakeLists.txt new file mode 100644 index 0000000..bb16d23 --- /dev/null +++ b/kttsd/plugins/command/CMakeLists.txt @@ -0,0 +1,38 @@ + +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} + ${CMAKE_SOURCE_DIR}/kttsd/libkttsd +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### libkttsd_commandplugin (kpart) + +tde_add_kpart( libkttsd_commandplugin AUTOMOC + + SOURCES + commandconfwidget.ui + commandconf.cpp + commandproc.cpp + commandplugin.cpp + LINK + kttsd-shared + + DESTINATION ${PLUGIN_INSTALL_DIR} +) + + +##### other data + +tde_create_translated_desktop( + SOURCE kttsd_commandplugin.desktop + DESTINATION ${SERVICES_INSTALL_DIR} +) diff --git a/kttsd/plugins/command/commandconfwidget.ui b/kttsd/plugins/command/commandconfwidget.ui index 75ce080..64d804c 100644 --- a/kttsd/plugins/command/commandconfwidget.ui +++ b/kttsd/plugins/command/commandconfwidget.ui @@ -218,10 +218,4 @@ configurationChanged() - - kurlrequester.h - klineedit.h - kpushbutton.h - kcombobox.h - diff --git a/kttsd/plugins/epos/CMakeLists.txt b/kttsd/plugins/epos/CMakeLists.txt new file mode 100644 index 0000000..7111386 --- /dev/null +++ b/kttsd/plugins/epos/CMakeLists.txt @@ -0,0 +1,38 @@ + +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} + ${CMAKE_SOURCE_DIR}/kttsd/libkttsd +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### libkttsd_eposplugin (kpart) + +tde_add_kpart( libkttsd_eposplugin AUTOMOC + + SOURCES + eposconfwidget.ui + eposconf.cpp + eposproc.cpp + eposplugin.cpp + LINK + kttsd-shared + + DESTINATION ${PLUGIN_INSTALL_DIR} +) + + +##### other data + +tde_create_translated_desktop( + SOURCE kttsd_eposplugin.desktop + DESTINATION ${SERVICES_INSTALL_DIR} +) diff --git a/kttsd/plugins/epos/eposconfwidget.ui b/kttsd/plugins/epos/eposconfwidget.ui index c66a081..f93ed72 100644 --- a/kttsd/plugins/epos/eposconfwidget.ui +++ b/kttsd/plugins/epos/eposconfwidget.ui @@ -593,18 +593,10 @@ kurlrequester.h - kurlrequester.h + kcombobox.h + klineedit.h + kpushbutton.h + knuminput.h - - kcombobox.h - knuminput.h - knuminput.h - kurlrequester.h - klineedit.h - kpushbutton.h - kurlrequester.h - klineedit.h - kpushbutton.h - diff --git a/kttsd/plugins/festivalint/CMakeLists.txt b/kttsd/plugins/festivalint/CMakeLists.txt new file mode 100644 index 0000000..3243c05 --- /dev/null +++ b/kttsd/plugins/festivalint/CMakeLists.txt @@ -0,0 +1,48 @@ + +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} + ${CMAKE_SOURCE_DIR}/kttsd/libkttsd +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### libkttsd_festivalintplugin (kpart) + +tde_add_kpart( libkttsd_festivalintplugin AUTOMOC + + SOURCES + festivalintconfwidget.ui + festivalintconf.cpp + festivalintproc.cpp + festivalintplugin.cpp + LINK + kttsd-shared + + DESTINATION ${PLUGIN_INSTALL_DIR} +) + + +##### other data + +tde_create_translated_desktop( + SOURCE kttsd_festivalintplugin.desktop + DESTINATION ${SERVICES_INSTALL_DIR} +) + +install( + FILES SSMLtoSable.xsl + DESTINATION ${DATA_INSTALL_DIR}/kttsd/festivalint/xslt +) + +install( + FILES voices sabletowave.scm + DESTINATION ${DATA_INSTALL_DIR}/kttsd/festivalint +) diff --git a/kttsd/plugins/festivalint/festivalintconfwidget.ui b/kttsd/plugins/festivalint/festivalintconfwidget.ui index 76a570f..c740eaf 100644 --- a/kttsd/plugins/festivalint/festivalintconfwidget.ui +++ b/kttsd/plugins/festivalint/festivalintconfwidget.ui @@ -581,18 +581,10 @@ kurlrequester.h - kurlrequester.h + kcombobox.h + klineedit.h + kpushbutton.h + knuminput.h - - kurlrequester.h - klineedit.h - kpushbutton.h - kcombobox.h - kpushbutton.h - knuminput.h - knuminput.h - knuminput.h - kcombobox.h - diff --git a/kttsd/plugins/flite/CMakeLists.txt b/kttsd/plugins/flite/CMakeLists.txt new file mode 100644 index 0000000..4c67af0 --- /dev/null +++ b/kttsd/plugins/flite/CMakeLists.txt @@ -0,0 +1,38 @@ + +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} + ${CMAKE_SOURCE_DIR}/kttsd/libkttsd +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### libkttsd_fliteplugin (kpart) + +tde_add_kpart( libkttsd_fliteplugin AUTOMOC + + SOURCES + fliteconfwidget.ui + fliteconf.cpp + fliteproc.cpp + fliteplugin.cpp + LINK + kttsd-shared + + DESTINATION ${PLUGIN_INSTALL_DIR} +) + + +##### other data + +tde_create_translated_desktop( + SOURCE kttsd_fliteplugin.desktop + DESTINATION ${SERVICES_INSTALL_DIR} +) diff --git a/kttsd/plugins/flite/fliteconfwidget.ui b/kttsd/plugins/flite/fliteconfwidget.ui index 8efcbb1..ef90e54 100644 --- a/kttsd/plugins/flite/fliteconfwidget.ui +++ b/kttsd/plugins/flite/fliteconfwidget.ui @@ -175,12 +175,8 @@ kurlrequester.h - kurlrequester.h + klineedit.h + kpushbutton.h - - kurlrequester.h - klineedit.h - kpushbutton.h - diff --git a/kttsd/plugins/freetts/CMakeLists.txt b/kttsd/plugins/freetts/CMakeLists.txt new file mode 100644 index 0000000..c98f2ec --- /dev/null +++ b/kttsd/plugins/freetts/CMakeLists.txt @@ -0,0 +1,37 @@ +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/kttsd/libkttsd + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### libkttsd_freettsplugin (kpart) + +tde_add_kpart( libkttsd_freettsplugin AUTOMOC + + SOURCES + freettsconfigwidget.ui + freettsconf.cpp + freettsproc.cpp + freettsplugin.cpp + LINK + kttsd-shared + + DESTINATION ${PLUGIN_INSTALL_DIR} +) + + +##### other data + +tde_create_translated_desktop( + SOURCE kttsd_freettsplugin.desktop + DESTINATION ${SERVICES_INSTALL_DIR} +) diff --git a/kttsd/plugins/freetts/freettsconfigwidget.ui b/kttsd/plugins/freetts/freettsconfigwidget.ui index e93f3ba..91d9988 100644 --- a/kttsd/plugins/freetts/freettsconfigwidget.ui +++ b/kttsd/plugins/freetts/freettsconfigwidget.ui @@ -189,12 +189,8 @@ kurlrequester.h - kurlrequester.h + klineedit.h + kpushbutton.h - - kurlrequester.h - klineedit.h - kpushbutton.h - diff --git a/kttsd/plugins/hadifix/CMakeLists.txt b/kttsd/plugins/hadifix/CMakeLists.txt new file mode 100644 index 0000000..3372b5e --- /dev/null +++ b/kttsd/plugins/hadifix/CMakeLists.txt @@ -0,0 +1,45 @@ + +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} + ${CMAKE_SOURCE_DIR}/kttsd/libkttsd +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### libkttsd_hadifixplugin (kpart) + +tde_add_kpart( libkttsd_hadifixplugin AUTOMOC + + SOURCES + hadifixconfigui.ui + voicefileui.ui + hadifixconf.cpp + hadifixproc.cpp + hadifixplugin.cpp + LINK + tdecore-shared + kttsd-shared + + DESTINATION ${PLUGIN_INSTALL_DIR} +) + + +##### other data + +tde_create_translated_desktop( + SOURCE kttsd_hadifixplugin.desktop + DESTINATION ${SERVICES_INSTALL_DIR} +) + +install( + FILES SSMLtoTxt2pho.xsl + DESTINATION ${DATA_INSTALL_DIR}/kttsd/hadifix/xslt +) diff --git a/kttsd/plugins/hadifix/hadifixconfigui.ui b/kttsd/plugins/hadifix/hadifixconfigui.ui index 367200c..4baf158 100644 --- a/kttsd/plugins/hadifix/hadifixconfigui.ui +++ b/kttsd/plugins/hadifix/hadifixconfigui.ui @@ -640,6 +640,11 @@ tqstringlist.h math.h kiconloader.h + kcombobox.h + klineedit.h + kpushbutton.h + knuminput.h + kurlrequester.h class TQStringList; @@ -674,19 +679,4 @@ isMaleVoice() - - kcombobox.h - kpushbutton.h - knuminput.h - knuminput.h - knuminput.h - kurlrequester.h - klineedit.h - kpushbutton.h - kurlrequester.h - klineedit.h - kpushbutton.h - kcombobox.h - kpushbutton.h - diff --git a/kttsd/plugins/hadifix/voicefileui.ui b/kttsd/plugins/hadifix/voicefileui.ui index c333670..19c63a4 100644 --- a/kttsd/plugins/hadifix/voicefileui.ui +++ b/kttsd/plugins/hadifix/voicefileui.ui @@ -100,6 +100,9 @@ kurlrequesterdlg.h tdemessagebox.h + klineedit.h + kpushbutton.h + kurlrequester.h hadifixproc.h voicefileui.ui.h @@ -110,10 +113,4 @@ genderButton_clicked() - - kurlrequester.h - klineedit.h - kpushbutton.h - kpushbutton.h - -- cgit v1.2.1