[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdenetwork
From: George Kiagiadakis <kiagiadakis.george () gmail ! com>
Date: 2012-03-06 21:27:32
Message-ID: 20120306212732.706D4AC897 () svn ! kde ! org
[Download RAW message or body]
SVN commit 1283940 by gkiagia:
Remove the BUILD_WITH_EXPERIMENTAL_TUBES option and update the top-level build system \
files to look for tp-qt 0.9 Telepathy support is no longer considered experimental.
M +1 -11 CMakeLists.txt
D cmake/modules/FindTelepathyQt4.cmake
M +9 -13 krdc/CMakeLists.txt
M +0 -4 krfb/CMakeLists.txt
M +5 -5 krfb/krfb/CMakeLists.txt
--- trunk/KDE/kdenetwork/CMakeLists.txt #1283939:1283940
@@ -59,19 +59,9 @@
macro_optional_find_package(LibMms)
macro_log_feature(LIBMMS_FOUND "libmms" "Library to read mms streams" \
"http://libmms.sourceforge.net" FALSE "" "Needed to build KGet mms support.")
-option(BUILD_EXPERIMENTAL_TUBES_SUPPORT "Builds experimental Tubes support for krfb \
and krdc. This is a very experimental feature and should not be shipped in \
distribution packages." OFF)
-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.") +macro_log_feature(TelepathyQt4_FOUND "telepathy-qt" "Telepathy Qt \
Bindings" "http://telepathy.freedesktop.org" FALSE "0.9" "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)
-
add_definitions (${QT_DEFINITIONS} ${QT_QTDBUS_DEFINITIONS} ${KDE4_DEFINITIONS})
add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} \
${KDEPIMLIBS_INCLUDE_DIR})
--- trunk/KDE/kdenetwork/krdc/CMakeLists.txt #1283939:1283940
@@ -31,23 +31,19 @@
# 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 (BUILD_EXPERIMENTAL_TUBES_SUPPORT)
- message(WARNING "You enabled experimental Tubes support. Expect breakage!!")
-
macro_optional_find_package(TelepathyQt4)
macro_log_feature(TelepathyQt4_FOUND "telepathy-qt" "Telepathy Qt Bindings" \
"http://telepathy.freedesktop.org" FALSE "0.9" "Needed to build Telepathy Tubes \
support.")
- if(TelepathyQt4_FOUND)
- add_definitions(-DTELEPATHY_SUPPORT)
- include_directories(${TELEPATHY_QT4_INCLUDE_DIR})
- endif()
- endif (BUILD_EXPERIMENTAL_TUBES_SUPPORT)
-
endif(NOT INSIDE_KDENETWORK)
macro_optional_find_package(LibVNCServer)
macro_log_feature(LIBVNCSERVER_FOUND "libvncserver" "VNC Server library" \
"http://libvncserver.sourceforge.net/" FALSE "0.9" "Needed to build Krfb and VNC \
support in Krdc")
+if(TelepathyQt4_FOUND)
+ add_definitions(-DTELEPATHY_SUPPORT)
+ include_directories(${TELEPATHY_QT4_INCLUDE_DIR})
+endif()
+
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/core/
@@ -61,7 +57,7 @@
add_subdirectory(rdp)
add_subdirectory(test)
-if(BUILD_EXPERIMENTAL_TUBES_SUPPORT AND TelepathyQt4_FOUND)
+if(TelepathyQt4_FOUND)
add_subdirectory(krdc_approver)
endif()
@@ -81,7 +77,7 @@
main.cpp
)
-if(BUILD_EXPERIMENTAL_TUBES_SUPPORT AND TelepathyQt4_FOUND)
+if(TelepathyQt4_FOUND)
set(krdc_SRCS ${krdc_SRCS}
tubesmanager.cpp
)
@@ -101,7 +97,7 @@
krdccore
)
-if(BUILD_EXPERIMENTAL_TUBES_SUPPORT AND TelepathyQt4_FOUND)
+if(TelepathyQt4_FOUND)
target_link_libraries(krdc
${TELEPATHY_QT4_LIBRARIES}
)
@@ -114,7 +110,7 @@
install(PROGRAMS krdc.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
install(FILES pointcursor.png pointcursormask.png DESTINATION \
${DATA_INSTALL_DIR}/krdc/pics)
-if(BUILD_EXPERIMENTAL_TUBES_SUPPORT AND TelepathyQt4_FOUND)
+if(TelepathyQt4_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
--- trunk/KDE/kdenetwork/krfb/CMakeLists.txt #1283939:1283940
@@ -12,12 +12,8 @@
include(CheckSymbolExists)
- if (BUILD_EXPERIMENTAL_TUBES_SUPPORT)
- message(WARNING "You enabled experimental Tubes support. Expect breakage!!")
-
macro_optional_find_package(TelepathyQt4)
macro_log_feature(TelepathyQt4_FOUND "telepathy-qt" "Telepathy Qt Bindings" \
"http://telepathy.freedesktop.org" FALSE "0.9" "Needed to build Telepathy Tubes \
support.")
- endif (BUILD_EXPERIMENTAL_TUBES_SUPPORT)
set(CMAKE_REQUIRED_DEFINITIONS ${_KDE_PLATFORM_DEFINITIONS})
--- trunk/KDE/kdenetwork/krfb/krfb/CMakeLists.txt #1283939:1283940
@@ -41,7 +41,7 @@
# Second target: krfb - the app
# itself.
-if(BUILD_EXPERIMENTAL_TUBES_SUPPORT AND TelepathyQt4_FOUND)
+if(TelepathyQt4_FOUND)
add_definitions(-DKRFB_WITH_TELEPATHY_TUBES)
include_directories(${TELEPATHY_QT4_INCLUDE_DIR})
endif()
@@ -65,7 +65,7 @@
invitationsrfbclient.cpp
)
-if(BUILD_EXPERIMENTAL_TUBES_SUPPORT AND TelepathyQt4_FOUND)
+if(TelepathyQt4_FOUND)
set (krfb_SRCS
${krfb_SRCS}
tubesrfbserver.cpp
@@ -86,7 +86,7 @@
ui/personalinvitewidget.ui
)
-if(BUILD_EXPERIMENTAL_TUBES_SUPPORT AND TelepathyQt4_FOUND)
+if(TelepathyQt4_FOUND)
kde4_add_ui_files(krfb_SRCS ui/tubesconnectionwidget.ui)
endif()
@@ -106,7 +106,7 @@
${KDE4_KDEUI_LIBS}
)
-if(BUILD_EXPERIMENTAL_TUBES_SUPPORT AND TelepathyQt4_FOUND)
+if(TelepathyQt4_FOUND)
target_link_libraries(krfb
${TELEPATHY_QT4_LIBRARIES}
)
@@ -122,7 +122,7 @@
${INSTALL_TARGETS_DEFAULT_ARGS}
)
-if(BUILD_EXPERIMENTAL_TUBES_SUPPORT AND TelepathyQt4_FOUND)
+if(TelepathyQt4_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
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic