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 /khangman | |
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 'khangman')
-rw-r--r-- | khangman/CMakeLists.txt | 1 | ||||
-rw-r--r-- | khangman/khangman/CMakeLists.txt | 68 | ||||
-rw-r--r-- | khangman/khangman/data/CMakeLists.txt | 1 | ||||
-rw-r--r-- | khangman/khangman/data/en/CMakeLists.txt | 6 | ||||
-rw-r--r-- | khangman/khangman/fonts/CMakeLists.txt | 4 | ||||
-rw-r--r-- | khangman/khangman/icons/CMakeLists.txt | 1 | ||||
-rw-r--r-- | khangman/khangman/pics/CMakeLists.txt | 1 | ||||
-rw-r--r-- | khangman/khangman/pics/desert/CMakeLists.txt | 6 | ||||
-rw-r--r-- | khangman/khangman/pics/sea/CMakeLists.txt | 8 | ||||
-rw-r--r-- | khangman/khangman/sounds/CMakeLists.txt | 4 | ||||
-rw-r--r-- | khangman/khangman/timerdlg.ui | 7 |
11 files changed, 103 insertions, 4 deletions
diff --git a/khangman/CMakeLists.txt b/khangman/CMakeLists.txt new file mode 100644 index 00000000..5bae6b2a --- /dev/null +++ b/khangman/CMakeLists.txt @@ -0,0 +1 @@ +add_subdirectory( khangman ) diff --git a/khangman/khangman/CMakeLists.txt b/khangman/khangman/CMakeLists.txt new file mode 100644 index 00000000..40d0fe38 --- /dev/null +++ b/khangman/khangman/CMakeLists.txt @@ -0,0 +1,68 @@ +add_subdirectory( data ) +add_subdirectory( pics ) +add_subdirectory( sounds ) +add_subdirectory( icons ) +add_subdirectory( fonts ) + +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} + ${CMAKE_SOURCE_DIR}/libtdeedu/tdeeducore +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### khangman (executable) + +tde_add_executable( khangman AUTOMOC + + SOURCES + prefs.kcfgc + normal.ui + advanced.ui + timerdlg.ui + khangman.cpp + main.cpp + khangmanview.cpp + khnewstuff.cpp + timer.cpp + fontchecker.cpp + LINK + tdecore-shared + tdeui-shared + tdeio-shared + tdenewstuff-shared + tdeeducore-shared + + DESTINATION ${BIN_INSTALL_DIR} +) + + +##### other data + +install( + FILES khangmanui.rc + DESTINATION ${DATA_INSTALL_DIR}/khangman +) + +install( + FILES khangman.desktop + DESTINATION ${XDG_APPS_INSTALL_DIR} +) + +install( + FILES khangman.kcfg + DESTINATION ${KCFG_INSTALL_DIR} +) + +install( + FILES khangmanrc + DESTINATION ${CONFIG_INSTALL_DIR} +) diff --git a/khangman/khangman/data/CMakeLists.txt b/khangman/khangman/data/CMakeLists.txt new file mode 100644 index 00000000..c9381755 --- /dev/null +++ b/khangman/khangman/data/CMakeLists.txt @@ -0,0 +1 @@ +add_subdirectory( en ) diff --git a/khangman/khangman/data/en/CMakeLists.txt b/khangman/khangman/data/en/CMakeLists.txt new file mode 100644 index 00000000..d22ad628 --- /dev/null +++ b/khangman/khangman/data/en/CMakeLists.txt @@ -0,0 +1,6 @@ +file( GLOB _kvtmls RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.kvtml ) + +install( + FILES ${_kvtmls} + DESTINATION ${DATA_INSTALL_DIR}/khangman/data/en +) diff --git a/khangman/khangman/fonts/CMakeLists.txt b/khangman/khangman/fonts/CMakeLists.txt new file mode 100644 index 00000000..eef21469 --- /dev/null +++ b/khangman/khangman/fonts/CMakeLists.txt @@ -0,0 +1,4 @@ +install( + FILES Dustismo_Roman.ttf Domestic_Manners.ttf + DESTINATION ${DATA_INSTALL_DIR}/khangman/fonts +) diff --git a/khangman/khangman/icons/CMakeLists.txt b/khangman/khangman/icons/CMakeLists.txt new file mode 100644 index 00000000..63f765b3 --- /dev/null +++ b/khangman/khangman/icons/CMakeLists.txt @@ -0,0 +1 @@ +tde_install_icons( ) diff --git a/khangman/khangman/pics/CMakeLists.txt b/khangman/khangman/pics/CMakeLists.txt new file mode 100644 index 00000000..6d0aa9f3 --- /dev/null +++ b/khangman/khangman/pics/CMakeLists.txt @@ -0,0 +1 @@ +tde_auto_add_subdirectories( ) diff --git a/khangman/khangman/pics/desert/CMakeLists.txt b/khangman/khangman/pics/desert/CMakeLists.txt new file mode 100644 index 00000000..2e3b6156 --- /dev/null +++ b/khangman/khangman/pics/desert/CMakeLists.txt @@ -0,0 +1,6 @@ +file( GLOB _pics RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.png ) + +install( + FILES ${_pics} + DESTINATION ${DATA_INSTALL_DIR}/khangman/pics/desert +) diff --git a/khangman/khangman/pics/sea/CMakeLists.txt b/khangman/khangman/pics/sea/CMakeLists.txt new file mode 100644 index 00000000..a2bb04b9 --- /dev/null +++ b/khangman/khangman/pics/sea/CMakeLists.txt @@ -0,0 +1,8 @@ +file( GLOB _pics RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.png ) + +list( REMOVE_ITEM _pics animation11.png ) + +install( + FILES ${_pics} + DESTINATION ${DATA_INSTALL_DIR}/khangman/pics/sea +) diff --git a/khangman/khangman/sounds/CMakeLists.txt b/khangman/khangman/sounds/CMakeLists.txt new file mode 100644 index 00000000..a3596ab8 --- /dev/null +++ b/khangman/khangman/sounds/CMakeLists.txt @@ -0,0 +1,4 @@ +install( + FILES new_game.ogg EW_Dialogue_Appear.ogg + DESTINATION ${DATA_INSTALL_DIR}/khangman/sounds +) diff --git a/khangman/khangman/timerdlg.ui b/khangman/khangman/timerdlg.ui index fcea8d8b..200527bd 100644 --- a/khangman/khangman/timerdlg.ui +++ b/khangman/khangman/timerdlg.ui @@ -222,8 +222,7 @@ </grid> </widget> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kactivelabel.h</includehint> - <includehint>kactivelabel.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kactivelabel.h</include> +</includes> </UI> |