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-27 16:35:25 +0200 |
| commit | d4a1613e9f119ae68c695ab60f8d9856d1a54a52 (patch) | |
| tree | 6de888ef76667e28c81832dc104c19b158859b9b /libtdeedu/tdeeduui | |
| parent | 9fb4e1ccde0b89b413bfdc8ae62f8178ecad5483 (diff) | |
| download | tdeedu-d4a1613e9f119ae68c695ab60f8d9856d1a54a52.tar.gz tdeedu-d4a1613e9f119ae68c695ab60f8d9856d1a54a52.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>
Diffstat (limited to 'libtdeedu/tdeeduui')
| -rw-r--r-- | libtdeedu/tdeeduui/CMakeLists.txt | 42 | ||||
| -rw-r--r-- | libtdeedu/tdeeduui/tdeeduglossary.h | 6 | ||||
| -rw-r--r-- | libtdeedu/tdeeduui/tests/CMakeLists.txt | 26 |
3 files changed, 71 insertions, 3 deletions
diff --git a/libtdeedu/tdeeduui/CMakeLists.txt b/libtdeedu/tdeeduui/CMakeLists.txt new file mode 100644 index 00000000..ae095223 --- /dev/null +++ b/libtdeedu/tdeeduui/CMakeLists.txt @@ -0,0 +1,42 @@ +add_subdirectory( tests ) + +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} +) + + +##### tdeeduui (shared) + +tde_add_library( tdeeduui SHARED AUTOMOC + + SOURCES + kedusimpleentrydlgForm.ui + kedusimpleentrydlg.cpp + tdeeduglossary.cpp + LINK + tdecore-shared + tdeio-shared + tdeui-shared + tdehtml-shared + + VERSION 3.0.5 + + DESTINATION ${LIB_INSTALL_DIR} +) + + +##### other data + +install( + FILES tdeeduglossary.h + DESTINATION ${INCLUDE_INSTALL_DIR}/libtdeedu +) diff --git a/libtdeedu/tdeeduui/tdeeduglossary.h b/libtdeedu/tdeeduui/tdeeduglossary.h index a649112e..dcb510d4 100644 --- a/libtdeedu/tdeeduui/tdeeduglossary.h +++ b/libtdeedu/tdeeduui/tdeeduglossary.h @@ -34,7 +34,7 @@ class GlossaryItem; * This class stores all items to be displayed. It also * has access-methods to the items */ -class Glossary +class KDE_EXPORT Glossary { public: Glossary(); @@ -176,7 +176,7 @@ class Glossary * a number of pictures or references associated to it. * These are stored as TQStringLists. */ -class GlossaryItem +class KDE_EXPORT GlossaryItem { public: GlossaryItem(){} @@ -237,7 +237,7 @@ class GlossaryItem * @author Pino Toscano * @author Carsten Niehaus */ -class GlossaryDialog : public KDialogBase +class KDE_EXPORT GlossaryDialog : public KDialogBase { Q_OBJECT diff --git a/libtdeedu/tdeeduui/tests/CMakeLists.txt b/libtdeedu/tdeeduui/tests/CMakeLists.txt new file mode 100644 index 00000000..eeb72a24 --- /dev/null +++ b/libtdeedu/tdeeduui/tests/CMakeLists.txt @@ -0,0 +1,26 @@ +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} + ${CMAKE_SOURCE_DIR}/tdeeduui +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### entrydialogs (test) + +tde_add_check_executable( entrydialogs AUTOMOC + + SOURCES + entrydialogs.cpp + LINK + tdeeduui-shared + + TEST +) |