network/krfb
network/krfb
1
0
Fork 0
mirror of https://invent.kde.org/network/krfb synced 2024-07-03 00:18:36 +00:00
Code Issues Projects Releases Wiki Activity

Make building tubes support an experimental option, disabled by default.

Browse Source 
svn path=/trunk/KDE/kdenetwork/krfb/; revision=1195363
This commit is contained in:
Dario Freddi 2010-11-10 22:25:36 +00:00
parent 7bd681fd44
commit 8825c4cddc
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -11,7 +11,13 @@ if(NOT INSIDE_KDENETWORK)
include(MacroLibrary)
include(CheckSymbolExists)
find_package(TelepathyQt4)
if (BUILD_EXPERIMENTAL_TUBES_SUPPORT)
message(WARNING "You enabled experimental Tubes support. Expect breakage!!")
macro_optional_find_package(TelepathyQt4)
macro_log_feature(TELEPATHY_QT4_FOUND "telepathy-qt4" "Telepathy Qt Bindings" "http://telepathy.freedesktop.org" FALSE "0.18" "Needed to build Telepathy Tubes support.")
endif (BUILD_EXPERIMENTAL_TUBES_SUPPORT)
set(CMAKE_REQUIRED_DEFINITIONS ${_KDE_PLATFORM_DEFINITIONS})

20
krfb/CMakeLists.txt
View File

@ -40,10 +40,10 @@ install (FILES
# Second target: krfb - the app
# itself.
if(TELEPATHY_QT4_FOUND)
if(BUILD_EXPERIMENTAL_TUBES_SUPPORT AND TELEPATHY_QT4_FOUND)
add_definitions(-DKRFB_WITH_TELEPATHY_TUBES)
include_directories(${TELEPATHY_QT4_INCLUDE_DIR})
endif(TELEPATHY_QT4_FOUND)
endif(BUILD_EXPERIMENTAL_TUBES_SUPPORT AND TELEPATHY_QT4_FOUND)
set (krfb_SRCS
connectiondialog.cpp
@ -64,14 +64,14 @@ set (krfb_SRCS
invitationsrfbclient.cpp
)
if (TELEPATHY_QT4_FOUND)
if (BUILD_EXPERIMENTAL_TUBES_SUPPORT AND TELEPATHY_QT4_FOUND)
set (krfb_SRCS
${krfb_SRCS}
tubesrfbserver.cpp
tubesrfbclient.cpp
tubesclienthandler.cpp
)
endif (TELEPATHY_QT4_FOUND)
endif (BUILD_EXPERIMENTAL_TUBES_SUPPORT AND TELEPATHY_QT4_FOUND)
kde4_add_kcfg_files (krfb_SRCS
krfbconfig.kcfgc
@ -86,9 +86,9 @@ kde4_add_ui_files (krfb_SRCS
ui/personalinvitewidget.ui
)
if (TELEPATHY_QT4_FOUND)
if (BUILD_EXPERIMENTAL_TUBES_SUPPORT AND TELEPATHY_QT4_FOUND)
kde4_add_ui_files(krfb_SRCS ui/tubesconnectionwidget.ui)
endif()
endif(BUILD_EXPERIMENTAL_TUBES_SUPPORT AND TELEPATHY_QT4_FOUND)
kde4_add_executable (krfb
${krfb_SRCS}
@ -106,11 +106,11 @@ target_link_libraries (krfb
${KDE4_KDEUI_LIBS}
)
if (TELEPATHY_QT4_FOUND)
if (BUILD_EXPERIMENTAL_TUBES_SUPPORT AND TELEPATHY_QT4_FOUND)
target_link_libraries(krfb
${TELEPATHY_QT4_LIBRARIES}
)
endif (TELEPATHY_QT4_FOUND)
endif (BUILD_EXPERIMENTAL_TUBES_SUPPORT AND TELEPATHY_QT4_FOUND)
if (X11_XTest_FOUND)
target_link_libraries (krfb
@ -122,14 +122,14 @@ install (TARGETS krfb
${INSTALL_TARGETS_DEFAULT_ARGS}
)
if (TELEPATHY_QT4_FOUND)
if (BUILD_EXPERIMENTAL_TUBES_SUPPORT AND TELEPATHY_QT4_FOUND)
configure_file(org.freedesktop.Telepathy.Client.krfb_rfb_handler.service.in
org.freedesktop.Telepathy.Client.krfb_rfb_handler.service)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.krfb_rfb_handler.service
DESTINATION ${DBUS_SERVICES_INSTALL_DIR})
install(FILES krfb_rfb_handler.client DESTINATION ${CMAKE_INSTALL_PREFIX}/share/telepathy/clients/)
endif (TELEPATHY_QT4_FOUND)
endif (BUILD_EXPERIMENTAL_TUBES_SUPPORT AND TELEPATHY_QT4_FOUND)
########### install files ###############