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

svn path=/trunk/KDE/kdenetwork/krdc/; revision=1195363

CMakeLists.txt

@@ -19,9 +19,6 @@ if(NOT INSIDE_KDENETWORK)
     include(CheckPrototypeExists)
     include(CheckTypeSize)
 
-    macro_optional_find_package(TelepathyQt4)
-    macro_log_feature(TELEPATHY_QT4_FOUND "telepathy-qt4" "Telepathy Qt Bindings" "https://telepathy.freedesktop.org" FALSE "0.18" "Needed to build Telepathy Tubes support.")
-
     set(CMAKE_REQUIRED_DEFINITIONS ${_KDE4_PLATFORM_DEFINITIONS})
     if(WIN32)
        set(CMAKE_REQUIRED_LIBRARIES ${KDEWIN32_LIBRARIES})
@@ -37,10 +34,17 @@ if(NOT INSIDE_KDENETWORK)
     # macro_optional_find_package(LibNXCL)
     # macro_log_feature(LIBNXCL_FOUND "libnxcl" "NX X compression client library" "http://svn.berlios.de/svnroot/repos/freenx/trunk/freenx-client/nxcl/" FALSE "1.0" "Needed to build Krdc with NX support")
 
-	if(TELEPATHY_QT4_FOUND)
-    	add_definitions(-DTELEPATHY_SUPPORT)
-    	include_directories(${TELEPATHY_QT4_INCLUDE_DIR})
-	endif(TELEPATHY_QT4_FOUND)
+    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.")
+
+        if (TELEPATHY_QT4_FOUND)
+            add_definitions(-DTELEPATHY_SUPPORT)
+            include_directories(${TELEPATHY_QT4_INCLUDE_DIR})
+        endif (TELEPATHY_QT4_FOUND)
+    endif (BUILD_EXPERIMENTAL_TUBES_SUPPORT)
 
 endif(NOT INSIDE_KDENETWORK)
 
@@ -57,9 +61,9 @@ add_subdirectory(nx)
 add_subdirectory(rdp)
 add_subdirectory(test)
 
-if(TELEPATHY_QT4_FOUND)
+if(BUILD_EXPERIMENTAL_TUBES_SUPPORT AND TELEPATHY_QT4_FOUND)
     add_subdirectory(krdc_approver)
-endif(TELEPATHY_QT4_FOUND)
+endif(BUILD_EXPERIMENTAL_TUBES_SUPPORT AND TELEPATHY_QT4_FOUND)
 
 add_definitions(-DKDE_DEFAULT_DEBUG_AREA=5010)
 add_definitions(-DBUILD_ZEROCONF)
@@ -77,12 +81,12 @@ set(krdc_SRCS
     main.cpp
 )
 
-if(TELEPATHY_QT4_FOUND)
+if(BUILD_EXPERIMENTAL_TUBES_SUPPORT AND TELEPATHY_QT4_FOUND)
     set(krdc_SRCS ${krdc_SRCS}
         tubesmanager.cpp
         tube.cpp
     )
-endif(TELEPATHY_QT4_FOUND)
+endif(BUILD_EXPERIMENTAL_TUBES_SUPPORT AND TELEPATHY_QT4_FOUND)
 
 kde4_add_ui_files(krdc_SRCS
     config/general.ui
@@ -98,11 +102,11 @@ target_link_libraries(krdc
     krdccore
 )
 
-if(TELEPATHY_QT4_FOUND)
+if(BUILD_EXPERIMENTAL_TUBES_SUPPORT AND TELEPATHY_QT4_FOUND)
     target_link_libraries(krdc
         ${TELEPATHY_QT4_LIBRARIES}
     )
-endif(TELEPATHY_QT4_FOUND)
+endif(BUILD_EXPERIMENTAL_TUBES_SUPPORT AND TELEPATHY_QT4_FOUND)
 
 target_link_libraries(krdc ${KDE4_KDNSSD_LIBS})
 
@@ -111,14 +115,14 @@ install(FILES krdcui.rc DESTINATION ${DATA_INSTALL_DIR}/krdc)
 install(PROGRAMS krdc.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
 install(FILES pointcursor.png pointcursormask.png DESTINATION ${DATA_INSTALL_DIR}/krdc/pics)
 
-if(TELEPATHY_QT4_FOUND)
+if(BUILD_EXPERIMENTAL_TUBES_SUPPORT AND TELEPATHY_QT4_FOUND)
     configure_file(org.freedesktop.Telepathy.Client.krdc_rfb_handler.service.in
                     ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.krdc_rfb_handler.service)
     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.krdc_rfb_handler.service
             DESTINATION ${DBUS_SERVICES_INSTALL_DIR})
 
     install(FILES krdc_rfb_handler.client DESTINATION ${SHARE_INSTALL_PREFIX}/telepathy/clients/)
-endif(TELEPATHY_QT4_FOUND)
+endif(BUILD_EXPERIMENTAL_TUBES_SUPPORT AND TELEPATHY_QT4_FOUND)
 
 if(NOT INSIDE_KDENETWORK)
     macro_display_feature_log()