From fd907e533d5ae62daa846aefbdb6d3c27fcb0b2c Mon Sep 17 00:00:00 2001 From: Slávek Banko Date: Sat, 17 Nov 2012 16:06:35 +0100 Subject: Fix various cmake build issues (cherry picked from commit 96f0726b226f4b404c38f998fbdd02cf728ba6e8) --- vcs/cvsservice/CMakeLists.txt | 5 ++--- vcs/cvsservice/integrator/CMakeLists.txt | 3 ++- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'vcs') diff --git a/vcs/cvsservice/CMakeLists.txt b/vcs/cvsservice/CMakeLists.txt index 8e6e986f..6099d2b7 100644 --- a/vcs/cvsservice/CMakeLists.txt +++ b/vcs/cvsservice/CMakeLists.txt @@ -9,8 +9,6 @@ # ################################################# -tde_import( cervisia ) - add_subdirectory( integrator ) include_directories( @@ -25,6 +23,7 @@ include_directories( link_directories( ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} ) @@ -54,6 +53,6 @@ tde_add_kpart( libkdevcvsservice AUTOMOC annotatepage.cpp annotateview.cpp LINK kdevextensions-static kdevwidgets-shared kdevelop-shared - cvsservice-shared khtml-shared + cvsservice khtml-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/vcs/cvsservice/integrator/CMakeLists.txt b/vcs/cvsservice/integrator/CMakeLists.txt index ff0b8ec5..b2933832 100644 --- a/vcs/cvsservice/integrator/CMakeLists.txt +++ b/vcs/cvsservice/integrator/CMakeLists.txt @@ -19,6 +19,7 @@ include_directories( link_directories( ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} ) @@ -34,6 +35,6 @@ tde_add_kpart( libcvsserviceintegrator AUTOMOC cvsserviceintegrator.cpp integratordlgbase.ui fetcherdlgbase.ui integratordlg.cpp initdlg.ui LINK - kdevextras-shared kdevelop-shared cvsservice-shared + kdevextras-shared kdevelop-shared cvsservice DESTINATION ${PLUGIN_INSTALL_DIR} ) -- cgit v1.2.3