diff options
author | gregory guy <g-gregory@gmx.fr> | 2019-06-27 16:35:25 +0200 |
---|---|---|
committer | Slávek Banko <slavek.banko@axis.cz> | 2019-06-28 13:45:47 +0200 |
commit | aca01d5a8b7d3de53fa34696e18c91db720a5ab6 (patch) | |
tree | 6b9b83c599cc5db58df8041ca5cf812e00bbd25e /kiten | |
parent | 88af19c041ad4f1139f6f0a35cd1a4fe2018425f (diff) | |
download | tdeedu-aca01d5a8b7d3de53fa34696e18c91db720a5ab6.tar.gz tdeedu-aca01d5a8b7d3de53fa34696e18c91db720a5ab6.zip |
Conversion to the cmake building system.
Add includes to UI files to resolve FTBFS.
Signed-off-by: gregory guy <g-gregory@gmx.fr>
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit d4a1613e9f119ae68c695ab60f8d9856d1a54a52)
Diffstat (limited to 'kiten')
-rw-r--r-- | kiten/CMakeLists.txt | 107 | ||||
-rw-r--r-- | kiten/configdictionariesbase.ui | 7 | ||||
-rw-r--r-- | kiten/configfont.ui | 6 | ||||
-rw-r--r-- | kiten/pics/CMakeLists.txt | 1 |
4 files changed, 114 insertions, 7 deletions
diff --git a/kiten/CMakeLists.txt b/kiten/CMakeLists.txt new file mode 100644 index 00000000..ccc29cc2 --- /dev/null +++ b/kiten/CMakeLists.txt @@ -0,0 +1,107 @@ +add_subdirectory( pics ) + +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### kiten (executable) + +tde_add_executable( kiten AUTOMOC + + SOURCES + configsearching.ui + configlearn.ui + configfont.ui + configdictionariesbase.ui + main.cpp + kiten.cpp + learn.cpp + kloader.cpp + ksaver.cpp + configdictionaries.cpp + optiondialog.cpp + kitenconfig.kcfgc + LINK + tdecore-shared + tdeui-shared + tdeio-shared + kiten-shared + + DESTINATION ${BIN_INSTALL_DIR} +) + + +##### kitengen (executable) + +tde_add_executable( kitengen + + SOURCES + xjdxgen.c + LINK + tdecore-shared + tdeui-shared + tdeio-shared + + DESTINATION ${BIN_INSTALL_DIR} +) + + +##### kiten (shared) + +tde_add_library( kiten SHARED AUTOMOC + + SOURCES + kitenconfig.kcfgc + asyndeta.cpp + dict.cpp + widgets.cpp + kromajiedit.cpp + rad.cpp + deinf.cpp + LINK + tdecore-shared + tdeui-shared + tdeprint-shared + + VERSION 1.0.0 + + DESTINATION ${LIB_INSTALL_DIR} +) + + +##### other data + +install( + FILES edict kanjidic radkfile vconj romkana.cnv + DESTINATION ${DATA_INSTALL_DIR}/kiten +) + +install( + FILES kitenui.rc learnui.rc eeditui.rc + DESTINATION ${DATA_INSTALL_DIR}/kiten +) + +install( + FILES kiten.desktop + DESTINATION ${XDG_APPS_INSTALL_DIR} +) + +install( + FILES kiten.kcfg + DESTINATION ${KCFG_INSTALL_DIR} +) + +install( + FILES asyndeta.h dict.h widgets.h kromajiedit.h rad.h deinf.h + DESTINATION ${INCLUDE_INSTALL_DIR}/libkiten +) diff --git a/kiten/configdictionariesbase.ui b/kiten/configdictionariesbase.ui index 1df05174..9240b755 100644 --- a/kiten/configdictionariesbase.ui +++ b/kiten/configdictionariesbase.ui @@ -306,8 +306,7 @@ </hbox> </widget> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>tdelistview.h</includehint> - <includehint>tdelistview.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">tdelistview.h</include> +</includes> </UI> diff --git a/kiten/configfont.ui b/kiten/configfont.ui index c439108a..17bcef4b 100644 --- a/kiten/configfont.ui +++ b/kiten/configfont.ui @@ -27,7 +27,7 @@ </hbox> </widget> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>tdefontdialog.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">tdefontdialog.h</include> +</includes> </UI> diff --git a/kiten/pics/CMakeLists.txt b/kiten/pics/CMakeLists.txt new file mode 100644 index 00000000..63f765b3 --- /dev/null +++ b/kiten/pics/CMakeLists.txt @@ -0,0 +1 @@ +tde_install_icons( ) |