From eea71ca9ecdfbd4682054a86cc9bbf954af94693 Mon Sep 17 00:00:00 2001 From: gregory guy Date: Fri, 28 Jun 2019 15:14:51 +0200 Subject: 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. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: gregory guy 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 (cherry picked from commit 4c43d1fbb66a296958ed1d0dbddf3f8ac4466130) --- klinkstatus/src/cfg/CMakeLists.txt | 32 ++++++++++++++++++++++++++++++++ klinkstatus/src/cfg/Makefile.am | 6 +++++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 klinkstatus/src/cfg/CMakeLists.txt (limited to 'klinkstatus/src/cfg') diff --git a/klinkstatus/src/cfg/CMakeLists.txt b/klinkstatus/src/cfg/CMakeLists.txt new file mode 100644 index 00000000..41601328 --- /dev/null +++ b/klinkstatus/src/cfg/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} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### cfg (static) + +configure_file( ${TDE_CMAKE_TEMPLATES}/tde_dummy_cpp.cmake dummy.cpp COPYONLY ) + +tde_add_library( cfg STATIC_PIC AUTOMOC + + SOURCES + klsconfig.kcfgc + dummy.cpp +) + + +##### other data + +install( + FILES klinkstatus.kcfg + DESTINATION ${KCFG_INSTALL_DIR} +) diff --git a/klinkstatus/src/cfg/Makefile.am b/klinkstatus/src/cfg/Makefile.am index 2e74b2ad..02107718 100644 --- a/klinkstatus/src/cfg/Makefile.am +++ b/klinkstatus/src/cfg/Makefile.am @@ -2,5 +2,9 @@ kde_kcfg_DATA = klinkstatus.kcfg METASOURCES = AUTO libcfg_la_LDFLAGS = $(all_libraries) noinst_LTLIBRARIES = libcfg.la +CLEANFILES = dummy.cpp libcfg_la_SOURCES = dummy.cpp klsconfig.kcfgc -AM_CPPFLAGS=$(all_includes) \ No newline at end of file +AM_CPPFLAGS=$(all_includes) + +dummy.cpp: + echo > dummy.cpp -- cgit v1.2.1