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) --- quanta/src/CMakeLists.txt | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) (limited to 'quanta/src/CMakeLists.txt') diff --git a/quanta/src/CMakeLists.txt b/quanta/src/CMakeLists.txt index ff7d5d4c..dfd385f1 100644 --- a/quanta/src/CMakeLists.txt +++ b/quanta/src/CMakeLists.txt @@ -19,6 +19,7 @@ include_directories( ${CMAKE_BINARY_DIR}/quanta/components/tableeditor ${CMAKE_BINARY_DIR}/quanta/components/csseditor ${CMAKE_BINARY_DIR}/quanta/components/framewizard + ${CMAKE_BINARY_DIR}/quanta/components/cvsservice ${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/quanta/src ${CMAKE_SOURCE_DIR}/quanta/project @@ -31,6 +32,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/quanta/components/tableeditor ${CMAKE_SOURCE_DIR}/quanta/components/csseditor ${CMAKE_SOURCE_DIR}/quanta/components/framewizard + ${CMAKE_SOURCE_DIR}/quanta/components/cvsservice ${CMAKE_SOURCE_DIR}/quanta/messages ${CMAKE_SOURCE_DIR}/quanta/treeviews ${CMAKE_SOURCE_DIR}/quanta/plugins @@ -57,6 +59,7 @@ install( FILES x-webprj.desktop DESTINATION ${MIME_INSTALL_DIR}/application ) set_property( SOURCE kqapp.cpp APPEND PROPERTY COMPILE_DEFINITIONS PREFIX="${CMAKE_INSTALL_PREFIX}" ) tde_add_executable( quanta AUTOMOC + SOURCES quanta_init.cpp quantaview.cpp quantadoc.cpp main.cpp document.cpp kqapp.cpp quanta.cpp @@ -64,15 +67,19 @@ tde_add_executable( quanta AUTOMOC dcopquantaif.skel dcopsettings.cpp dtds.cpp dcopquanta.cpp viewmanager.cpp LINK - project-static plugins-static parser-static - dtdparser-static treeviews-static dialogs-static - debuggermanager-static tagdialogs-static - settingsdialogs-static messages-static - framewizard-static csseditor-static - tableeditor-static preview-static - utility-static quantamodule-static - kafkalibrary-static tdemdi-shared tdehtml-shared - tdenewstuff-shared tdeabc-shared tdetexteditor-shared - ${LIBXML_LIBRARIES} ${LIBXSLT_LIBRARIES} + tdecore-shared tdeui-shared tdeio-shared + katepartinterfaces-shared tdenewstuff-shared + tdeabc-shared tdetexteditor-shared + tdemdi-shared tdehtml-shared tdespell-shared + kafkalibrary-static project-static + plugins-static parser-static + dtdparser-static treeviews-static + dialogs-static debuggermanager-static + tagdialogs-static settingsdialogs-static + messages-static framewizard-static + csseditor-static tableeditor-static + preview-static utility-static quantamodule-static + ${LIBXML_LIBRARIES} ${LIBXSLT_LIBRARIES} ${CVSSERVICE_LIBRARIES} + DESTINATION ${BIN_INSTALL_DIR} ) -- cgit v1.2.1