diff options
author | gregory guy <g-gregory@gmx.fr> | 2019-06-28 15:14:51 +0200 |
---|---|---|
committer | Slávek Banko <slavek.banko@axis.cz> | 2021-03-12 00:35:39 +0100 |
commit | eea71ca9ecdfbd4682054a86cc9bbf954af94693 (patch) | |
tree | ec6ffbfad0861bf4195509dfb13845aa4bb17085 /klinkstatus/src/ui/settings | |
parent | 14a52daecece82f3be90c37de2873eb368cbe415 (diff) | |
download | tdewebdev-eea71ca9ecdfbd4682054a86cc9bbf954af94693.tar.gz tdewebdev-eea71ca9ecdfbd4682054a86cc9bbf954af94693.zip |
Conversion to the cmake building system.
Delete empty files (dummy.cpp, xsldbgconfig.h).
Remove hard-coded path for the kmdr-executor executable.
Replaced $TQTDIR/doc/html string path for TQTDOCDIR in kommander.
Add man pages taken from the Debian packaging.
Signed-off-by: gregory guy <gregory-tde@laposte.net>
Fix linking - kxsldbgcommon-static and kimagemapeditorcommon-static needs to be embedded.
Move the linking of xml and readline libraries to the appropriate static libraries.
Add build option WITH_QUANTA_CVSSERVICE.
Add a test whether the readline can be linked standalone or whether ncurses is needed.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 4c43d1fbb66a296958ed1d0dbddf3f8ac4466130)
Diffstat (limited to 'klinkstatus/src/ui/settings')
-rw-r--r-- | klinkstatus/src/ui/settings/CMakeLists.txt | 32 | ||||
-rw-r--r-- | klinkstatus/src/ui/settings/Makefile.am | 4 | ||||
-rw-r--r-- | klinkstatus/src/ui/settings/configidentificationdialogui.ui | 8 | ||||
-rw-r--r-- | klinkstatus/src/ui/settings/configsearchdialog.ui | 9 |
4 files changed, 43 insertions, 10 deletions
diff --git a/klinkstatus/src/ui/settings/CMakeLists.txt b/klinkstatus/src/ui/settings/CMakeLists.txt new file mode 100644 index 00000000..d1fb1f3d --- /dev/null +++ b/klinkstatus/src/ui/settings/CMakeLists.txt @@ -0,0 +1,32 @@ +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} + ${CMAKE_BINARY_DIR}/klinkstatus/src/cfg + ${CMAKE_BINARY_DIR}/klinkstatus/src +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### settings (static) + +file( WRITE ${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp "" ) + +tde_add_library( settings STATIC_PIC AUTOMOC + + SOURCES + configsearchdialog.ui + configresultsdialog.ui + configidentificationdialogui.ui + ${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp + configidentificationdialog.cpp + + DEPENDENCIES + cfg-static +) diff --git a/klinkstatus/src/ui/settings/Makefile.am b/klinkstatus/src/ui/settings/Makefile.am index 777e9e5c..07fcba6c 100644 --- a/klinkstatus/src/ui/settings/Makefile.am +++ b/klinkstatus/src/ui/settings/Makefile.am @@ -2,6 +2,10 @@ INCLUDES = -I$(top_builddir)/klinkstatus/src/cfg -I$(top_builddir)/klinkstatus/s METASOURCES = AUTO libsettings_la_LDFLAGS = $(all_libraries) noinst_LTLIBRARIES = libsettings.la +CLEANFILES = dummy.cpp libsettings_la_SOURCES = configsearchdialog.ui dummy.cpp configresultsdialog.ui \ configidentificationdialog.cpp configidentificationdialogui.ui noinst_HEADERS = configidentificationdialog.h + +dummy.cpp: + echo > dummy.cpp diff --git a/klinkstatus/src/ui/settings/configidentificationdialogui.ui b/klinkstatus/src/ui/settings/configidentificationdialogui.ui index 87b73fbf..8b30ed58 100644 --- a/klinkstatus/src/ui/settings/configidentificationdialogui.ui +++ b/klinkstatus/src/ui/settings/configidentificationdialogui.ui @@ -127,8 +127,8 @@ <tabstop>buttonDefault</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> +</includes> </UI> diff --git a/klinkstatus/src/ui/settings/configsearchdialog.ui b/klinkstatus/src/ui/settings/configsearchdialog.ui index 72c420ca..097c08fc 100644 --- a/klinkstatus/src/ui/settings/configsearchdialog.ui +++ b/klinkstatus/src/ui/settings/configsearchdialog.ui @@ -344,10 +344,7 @@ <tabstop>kcfg_RememberCheckSettings</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">knuminput.h</include> +</includes> </UI> |