diff options
| -rw-r--r-- | vcs/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | vcs/cvsservice/CMakeLists.txt | 14 | ||||
| -rw-r--r-- | vcs/cvsservice/integrator/CMakeLists.txt | 9 |
3 files changed, 7 insertions, 18 deletions
diff --git a/vcs/CMakeLists.txt b/vcs/CMakeLists.txt index c2112360..8ec61b98 100644 --- a/vcs/CMakeLists.txt +++ b/vcs/CMakeLists.txt @@ -10,6 +10,6 @@ ################################################# tde_conditional_add_subdirectory( WITH_VCS_CLEARCASE clearcase ) -#tde_conditional_add_subdirectory( WITH_VCS_CVSSERVICE cvsservice ) +tde_conditional_add_subdirectory( WITH_VCS_CVSSERVICE cvsservice ) tde_conditional_add_subdirectory( WITH_VCS_PERFORCE perforce ) tde_conditional_add_subdirectory( WITH_VCS_SUBVERSION subversion ) diff --git a/vcs/cvsservice/CMakeLists.txt b/vcs/cvsservice/CMakeLists.txt index c6e0a0b8..8e6e986f 100644 --- a/vcs/cvsservice/CMakeLists.txt +++ b/vcs/cvsservice/CMakeLists.txt @@ -9,22 +9,16 @@ # ################################################# -# tde_message_fatal( "csvservice is not done yet" ) +tde_import( cervisia ) add_subdirectory( integrator ) include_directories( ${CMAKE_CURRENT_BINARY_DIR} - #${CMAKE_CURRENT_SOURCE_DIR} - #${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/lib/interfaces ${CMAKE_SOURCE_DIR}/lib/interfaces/extensions - #${CMAKE_SOURCE_DIR}/lib/interfaces/external - #${CMAKE_SOURCE_DIR}/lib/interfaces/extras ${CMAKE_SOURCE_DIR}/lib/util - #${CMAKE_SOURCE_DIR} - #${CMAKE_SOURCE_DIR} - #${CMAKE_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/lib/widgets ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) @@ -58,6 +52,8 @@ tde_add_kpart( libkdevcvsservice AUTOMOC cvsfileinfoprovider.cpp cvsservicedcopIface.skel editorsdialogbase.ui editorsdialog.cpp annotatedialog.cpp annotatepage.cpp annotateview.cpp - LINK kdevwidgets-shared kdevextensions-shared + LINK + kdevextensions-static kdevwidgets-shared kdevelop-shared + cvsservice-shared khtml-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/vcs/cvsservice/integrator/CMakeLists.txt b/vcs/cvsservice/integrator/CMakeLists.txt index cd8366b0..ff0b8ec5 100644 --- a/vcs/cvsservice/integrator/CMakeLists.txt +++ b/vcs/cvsservice/integrator/CMakeLists.txt @@ -11,16 +11,8 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} - #${CMAKE_CURRENT_SOURCE_DIR} - #${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/lib/interfaces - #${CMAKE_SOURCE_DIR}/lib/interfaces/extensions - #${CMAKE_SOURCE_DIR}/lib/interfaces/external ${CMAKE_SOURCE_DIR}/lib/interfaces/extras - #${CMAKE_SOURCE_DIR}/lib/util - #${CMAKE_SOURCE_DIR} - #${CMAKE_SOURCE_DIR} - #${CMAKE_SOURCE_DIR} ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) @@ -42,5 +34,6 @@ tde_add_kpart( libcvsserviceintegrator AUTOMOC cvsserviceintegrator.cpp integratordlgbase.ui fetcherdlgbase.ui integratordlg.cpp initdlg.ui LINK + kdevextras-shared kdevelop-shared cvsservice-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) |