[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdenetwork/krfb
From: George Goldberg <grundleborg () googlemail ! com>
Date: 2010-10-24 11:21:45
Message-ID: 20101024112145.1FADFAC897 () svn ! kde ! org
[Download RAW message or body]
SVN commit 1189252 by gberg:
Reorganise krfb codebase to make it easier to work with.
M +10 -102 CMakeLists.txt
D Messages.sh
D abstractconnectioncontroller.cpp
D abstractconnectioncontroller.h
D abstractrfbserver.cpp
D abstractrfbserver.h
D config-krfb.h.cmake
D configsecurity.ui
D configtcp.ui
D connectiondialog.cpp
D connectiondialog.h
D connectionwidget.ui
D events.cpp
D events.h
D framebuffer.cpp
D framebuffer.h
D framebuffermanager.cpp
D framebuffermanager.h
D framebufferplugin.cpp
D framebufferplugin.h
D invitation.cpp
D invitation.h
D invitationmanager.cpp
D invitationmanager.h
D invitedialog.cpp
D invitedialog.h
D invitewidget.ui
A krfb (directory)
D krfb-framebuffer.desktop
D krfb.desktop
D krfb.kcfg
D krfb.notifyrc
A krfb/CMakeLists.txt
A krfb/Messages.sh Messages.sh#1189037
A krfb/abstractconnectioncontroller.cpp \
abstractconnectioncontroller.cpp#1189037 [License: GPL (v2+)] A \
krfb/abstractconnectioncontroller.h abstractconnectioncontroller.h#1189037 \
[License: GPL (v2+)] A krfb/abstractrfbserver.cpp \
abstractrfbserver.cpp#1189037 [License: GPL (v2+)] A \
krfb/abstractrfbserver.h abstractrfbserver.h#1189037 [License: GPL (v2+)] A \
krfb/config-krfb.h.cmake config-krfb.h.cmake#1189037 A \
krfb/connectiondialog.cpp connectiondialog.cpp#1189037 [License: GPL (v2+)] A \
krfb/connectiondialog.h connectiondialog.h#1189037 [License: GPL (v2+)] A \
krfb/events.cpp events.cpp#1189037 [License: GPL (v2+)] A \
krfb/events.h events.h#1189037 [License: GPL (v2+)] A \
krfb/framebuffer.cpp framebuffer.cpp#1189037 [License: GPL (v2+)] A \
krfb/framebuffer.h framebuffer.h#1189037 [License: GPL (v2+)] A \
krfb/framebuffermanager.cpp framebuffermanager.cpp#1189037 [License: GPL (v2+)] A \
krfb/framebuffermanager.h framebuffermanager.h#1189037 [License: GPL (v2+)] A \
krfb/framebufferplugin.cpp framebufferplugin.cpp#1189037 [License: GPL (v2+)] A \
krfb/framebufferplugin.h framebufferplugin.h#1189037 [License: GPL (v2+)] A \
krfb/invitation.cpp invitation.cpp#1189037 [License: GPL (v2+)] A \
krfb/invitation.h invitation.h#1189037 [License: GPL (v2+)] A \
krfb/invitationmanager.cpp invitationmanager.cpp#1189037 [License: GPL (v2+)] A \
krfb/invitationmanager.h invitationmanager.h#1189037 [License: GPL (v2+)] A \
krfb/invitedialog.cpp invitedialog.cpp#1189037 [License: GPL (v2+)] A \
krfb/invitedialog.h invitedialog.h#1189037 [License: GPL (v2+)] A \
krfb/krfb-framebuffer.desktop krfb-framebuffer.desktop#1189037 A \
krfb/krfb.desktop krfb.desktop#1189037 A krfb/krfb.kcfg \
krfb.kcfg#1189037 A krfb/krfb.notifyrc krfb.notifyrc#1189037
A krfb/krfbconfig.kcfgc krfbconfig.kcfgc#1189037
A krfb/krfbconnectioncontroller.cpp \
krfbconnectioncontroller.cpp#1189037 [License: GPL (v2+)] A \
krfb/krfbconnectioncontroller.h krfbconnectioncontroller.h#1189037 [License: GPL \
(v2+)] A krfb/krfbserver.cpp krfbserver.cpp#1189037 [License: GPL \
(v2+)] A krfb/krfbserver.h krfbserver.h#1189037 [License: GPL (v2+)]
A krfb/main.cpp main.cpp#1189037 [License: GPL (v2+)]
A krfb/manageinvitationsdialog.cpp manageinvitationsdialog.cpp#1189037 \
[License: GPL (v2+)] A krfb/manageinvitationsdialog.h \
manageinvitationsdialog.h#1189037 [License: GPL (v2+)] A \
krfb/personalinvitedialog.cpp personalinvitedialog.cpp#1189037 [License: GPL (v2+)] \
A krfb/personalinvitedialog.h personalinvitedialog.h#1189037 [License: \
GPL (v2+)] A krfb/rfb.h rfb.h#1189037 [License: UNKNOWN]
A krfb/servermanager.cpp servermanager.cpp#1189037 [License: GPL \
(v2+)] A krfb/servermanager.h servermanager.h#1189037 [License: GPL \
(v2+)] A krfb/sockethelpers.cpp sockethelpers.cpp#1189037 [License: \
GPL (v2+)] A krfb/sockethelpers.h sockethelpers.h#1189037 [License: \
GPL (v2+)] A krfb/trayicon.cpp trayicon.cpp#1189037 [License: GPL \
(v2+)] A krfb/trayicon.h trayicon.h#1189037 [License: GPL (v2+)]
A krfb/ui (directory)
A krfb/ui/configsecurity.ui configsecurity.ui#1189037
A krfb/ui/configtcp.ui configtcp.ui#1189037
A krfb/ui/connectionwidget.ui connectionwidget.ui#1189037
A krfb/ui/invitewidget.ui invitewidget.ui#1189037
A krfb/ui/manageinvitations.ui manageinvitations.ui#1189037
A krfb/ui/personalinvitewidget.ui personalinvitewidget.ui#1189037
D krfbconfig.kcfgc
D krfbconnectioncontroller.cpp
D krfbconnectioncontroller.h
D krfbserver.cpp
D krfbserver.h
D main.cpp
D manageinvitations.ui
D manageinvitationsdialog.cpp
D manageinvitationsdialog.h
D personalinvitedialog.cpp
D personalinvitedialog.h
D personalinvitewidget.ui
D rfb.h
D servermanager.cpp
D servermanager.h
D sockethelpers.cpp
D sockethelpers.h
D trayicon.cpp
D trayicon.h
--- trunk/KDE/kdenetwork/krfb/CMakeLists.txt #1189251:1189252
@@ -19,119 +19,27 @@
include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES})
endif(NOT INSIDE_KDENETWORK)
+# FIXME: Can we merge this check back into FindLibVNCServer.cmake?
check_symbol_exists(rfbInitServer "rfb/rfb.h" HAVE_LIBVNCSERVER)
+
macro_bool_to_01(X11_Xdamage_FOUND HAVE_XDAMAGE)
macro_bool_to_01(X11_XShm_FOUND HAVE_XSHM)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-krfb.h.cmake \
${CMAKE_CURRENT_BINARY_DIR}/config-krfb.h )
-include_directories(${CMAKE_CURRENT_BINARY_DIR}) # for config-krfb.h
+include_directories ("${CMAKE_CURRENT_BINARY_DIR}/krfb"
+ "${CMAKE_CURRENT_SOURCE_DIR}/krfb"
+ "${CMAKE_CURRENT_SOURCE_DIR}/krfb/ui"
+)
+
if(Q_WS_X11)
if(NOT X11_XTest_FOUND)
macro_log_feature(X11_XTest_FOUND "libXtst" "X11 Testing Resource extension \
library" "http://xorg.freedesktop.org" FALSE "" "useful for automated testing of X \
clients.") endif(NOT X11_XTest_FOUND)
endif(Q_WS_X11)
+if (HAVE_LIBVNCSERVER)
#add_subdirectory(kinetd)
#add_subdirectory(kcm_krfb)
-if (HAVE_LIBVNCSERVER)
-
-#####################################
-# First target: libkrfb - a library
-# for linking plugins against.
-
-set (krfbprivate_SRCS
- framebuffer.cpp
- framebufferplugin.cpp
-)
-
-kde4_add_library (krfbprivate
- SHARED
- ${krfbprivate_SRCS}
-)
-
-target_link_libraries (krfbprivate
- ${QT_QTCORE_LIBRARY}
- ${QT_QTGUI_LIBRARY}
- ${X11_X11_LIB}
- ${LIBVNCSERVER_LIBRARIES}
-)
-
-set_target_properties (krfbprivate PROPERTIES
- VERSION ${GENERIC_LIB_VERSION}
- SOVERSION ${GENERIC_LIB_VERSION}
-)
-
-install (TARGETS krfbprivate
- ${INSTALL_TARGETS_DEFAULT_ARGS}
-)
-
-install (FILES
- krfb-framebuffer.desktop
- DESTINATION ${SERVICETYPES_INSTALL_DIR}
-)
-
-#####################################
-# Build the plugins
-
-include_directories (${CMAKE_CURRENT_SOURCE_DIR})
+ add_subdirectory(krfb)
add_subdirectory (framebuffers)
-
-#####################################
-# Second target: krfb - the app
-# itself.
-
-set(krfb_SRCS
- main.cpp
- trayicon.cpp
- manageinvitationsdialog.cpp
- invitationmanager.cpp
- invitedialog.cpp
- invitation.cpp
- connectiondialog.cpp
- personalinvitedialog.cpp
- events.cpp
- framebuffermanager.cpp
- servermanager.cpp
- sockethelpers.cpp
- abstractrfbserver.cpp
- abstractconnectioncontroller.cpp
- krfbserver.cpp
- krfbconnectioncontroller.cpp
-)
-
-kde4_add_kcfg_files(krfb_SRCS krfbconfig.kcfgc)
-
-kde4_add_ui_files(krfb_SRCS connectionwidget.ui
- manageinvitations.ui
- personalinvitewidget.ui
- invitewidget.ui
- configtcp.ui
- configsecurity.ui
- )
-
-kde4_add_executable(krfb ${krfb_SRCS})
-
-target_link_libraries(krfb
- krfbprivate
- ${JPEG_LIBRARIES}
- ${LIBVNCSERVER_LIBRARIES}
- ${X11_Xext_LIB}
- ${X11_X11_LIB}
- ${X11_Xdamage_LIB}
- ${QT_QTNETWORK_LIBRARY}
- ${KDE4_KDNSSD_LIBS}
- ${KDE4_KDEUI_LIBS}
-)
-
-if(X11_XTest_FOUND)
- target_link_libraries(krfb ${X11_XTest_LIB})
-endif(X11_XTest_FOUND)
-
-install(TARGETS krfb ${INSTALL_TARGETS_DEFAULT_ARGS})
-
-########### install files ###############
-
-install(PROGRAMS krfb.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
-install(FILES krfb.notifyrc DESTINATION ${DATA_INSTALL_DIR}/krfb)
-
endif (HAVE_LIBVNCSERVER)
+
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic