|
 |
74b83a |
--- kdenetwork-4.10.5/krfb/cmake/modules/FindLibVNCServer.cmake.unbundle_libvncserver 2014-08-06 09:04:40.532236267 -0500
|
|
|
74b83a |
+++ kdenetwork-4.10.5/krfb/cmake/modules/FindLibVNCServer.cmake 2014-08-06 09:04:40.532236267 -0500
|
|
|
74b83a |
@@ -0,0 +1,41 @@
|
|
|
74b83a |
+# cmake macro to test LIBVNCSERVER LIB
|
|
|
74b83a |
+
|
|
|
74b83a |
+# Copyright (c) 2006, Alessandro Praduroux <pradu@pradu.it>
|
|
|
74b83a |
+# Copyright (c) 2007, Urs Wolfer <uwolfer @ kde.org>
|
|
|
74b83a |
+#
|
|
|
74b83a |
+# Redistribution and use is allowed according to the terms of the BSD license.
|
|
|
74b83a |
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
|
|
|
74b83a |
+
|
|
|
74b83a |
+INCLUDE(CheckPointerMember)
|
|
|
74b83a |
+
|
|
|
74b83a |
+IF (LIBVNCSERVER_INCLUDE_DIR AND LIBVNCSERVER_LIBRARIES)
|
|
|
74b83a |
+ # Already in cache, be silent
|
|
|
74b83a |
+ SET(LIBVNCSERVER_FIND_QUIETLY TRUE)
|
|
|
74b83a |
+ENDIF (LIBVNCSERVER_INCLUDE_DIR AND LIBVNCSERVER_LIBRARIES)
|
|
|
74b83a |
+
|
|
|
74b83a |
+FIND_PATH(LIBVNCSERVER_INCLUDE_DIR rfb/rfb.h)
|
|
|
74b83a |
+
|
|
|
74b83a |
+FIND_LIBRARY(LIBVNCSERVER_LIBRARIES NAMES vncserver libvncserver)
|
|
|
74b83a |
+
|
|
|
74b83a |
+# libvncserver and libvncclient are in the same package, so it does
|
|
|
74b83a |
+# not make sense to add a new cmake script for finding libvncclient.
|
|
|
74b83a |
+# instead just find the libvncclient also in this file.
|
|
|
74b83a |
+FIND_PATH(LIBVNCCLIENT_INCLUDE_DIR rfb/rfbclient.h)
|
|
|
74b83a |
+FIND_LIBRARY(LIBVNCCLIENT_LIBRARIES NAMES vncclient libvncclient)
|
|
|
74b83a |
+
|
|
|
74b83a |
+IF (LIBVNCSERVER_INCLUDE_DIR AND LIBVNCSERVER_LIBRARIES)
|
|
|
74b83a |
+ SET(CMAKE_REQUIRED_INCLUDES "${LIBVNCSERVER_INCLUDE_DIR}" "${CMAKE_REQUIRED_INCLUDES}")
|
|
|
74b83a |
+ CHECK_POINTER_MEMBER(rfbClient* GotXCutText rfb/rfbclient.h LIBVNCSERVER_FOUND)
|
|
|
74b83a |
+ENDIF (LIBVNCSERVER_INCLUDE_DIR AND LIBVNCSERVER_LIBRARIES)
|
|
|
74b83a |
+
|
|
|
74b83a |
+IF (LIBVNCSERVER_FOUND)
|
|
|
74b83a |
+ IF (NOT LIBVNCSERVER_FIND_QUIETLY)
|
|
|
74b83a |
+ MESSAGE(STATUS "Found LibVNCServer: ${LIBVNCSERVER_LIBRARIES}")
|
|
|
74b83a |
+ ENDIF (NOT LIBVNCSERVER_FIND_QUIETLY)
|
|
|
74b83a |
+ELSE (LIBVNCSERVER_FOUND)
|
|
|
74b83a |
+ IF (LIBVNCSERVER_FIND_REQUIRED)
|
|
|
74b83a |
+ MESSAGE(FATAL_ERROR "Could NOT find acceptable version of LibVNCServer (version 0.9 or later required).")
|
|
|
74b83a |
+ ENDIF (LIBVNCSERVER_FIND_REQUIRED)
|
|
|
74b83a |
+ENDIF (LIBVNCSERVER_FOUND)
|
|
|
74b83a |
+
|
|
|
74b83a |
+MARK_AS_ADVANCED(LIBVNCSERVER_INCLUDE_DIR LIBVNCSERVER_LIBRARIES)
|
|
|
74b83a |
\ No newline at end of file
|
|
|
74b83a |
diff -up krfb-4.13.97/krfb/CMakeLists.txt.unbundle_libvncserver krfb-4.13.97/krfb/CMakeLists.txt
|
|
|
74b83a |
--- kdenetwork-4.10.5/krfb/krfb/CMakeLists.txt.unbundle_libvncserver 2014-04-15 16:12:33.000000000 -0500
|
|
|
74b83a |
+++ kdenetwork-4.10.5/krfb/krfb/CMakeLists.txt 2014-08-06 09:04:40.533236257 -0500
|
|
|
74b83a |
@@ -20,6 +20,7 @@ target_link_libraries (krfbprivate
|
|
|
74b83a |
${QT_QTCORE_LIBRARY}
|
|
|
74b83a |
${QT_QTGUI_LIBRARY}
|
|
|
74b83a |
${X11_X11_LIB}
|
|
|
74b83a |
+ ${LIBVNCSERVER_LIBRARIES}
|
|
|
74b83a |
)
|
|
|
74b83a |
|
|
|
74b83a |
set_target_properties (krfbprivate PROPERTIES
|
|
|
74b83a |
@@ -103,6 +104,7 @@ target_link_libraries (krfb
|
|
|
74b83a |
${QT_QTNETWORK_LIBRARY}
|
|
|
74b83a |
${KDE4_KDNSSD_LIBS}
|
|
|
74b83a |
${KDE4_KDEUI_LIBS}
|
|
|
74b83a |
+ ${LIBVNCSERVER_LIBRARIES}
|
|
|
74b83a |
)
|
|
|
74b83a |
|
|
|
74b83a |
if(TelepathyQt4_FOUND)
|
|
|
74b83a |
--- kdenetwork-4.10.5/krfb/krfb/rfb.h.unbundle_libvncserver 2014-04-15 16:12:33.000000000 -0500
|
|
|
74b83a |
+++ kdenetwork-4.10.5/krfb/krfb/rfb.h 2014-08-06 09:04:40.533236257 -0500
|
|
|
74b83a |
@@ -6,7 +6,7 @@
|
|
|
74b83a |
#ifndef KRFB_RFB_H
|
|
|
74b83a |
#define KRFB_RFB_H
|
|
|
74b83a |
|
|
|
74b83a |
-#include "../libvncserver/rfb/rfb.h"
|
|
|
74b83a |
+#include "rfb/rfb.h"
|
|
|
74b83a |
|
|
|
74b83a |
#undef TRUE
|
|
|
74b83a |
#undef FALSE
|
|
|
74b83a |
--- kdenetwork-4.10.5/krfb/CMakeLists.txt.orig 2014-10-31 10:57:00.937181663 +0100
|
|
|
74b83a |
+++ kdenetwork-4.10.5/krfb/CMakeLists.txt 2014-10-31 10:59:20.966543705 +0100
|
|
|
74b83a |
@@ -26,6 +26,9 @@
|
|
|
74b83a |
include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES})
|
|
|
74b83a |
endif(NOT INSIDE_KDENETWORK)
|
|
|
74b83a |
|
|
|
74b83a |
+set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH})
|
|
|
74b83a |
+find_package(LibVNCServer REQUIRED)
|
|
|
74b83a |
+
|
|
|
74b83a |
macro_optional_find_package(TelepathyQt4)
|
|
|
74b83a |
macro_log_feature(TelepathyQt4_FOUND "telepathy-qt" "Telepathy Qt Bindings" "http://telepathy.freedesktop.org" FALSE "0.9" "Needed to build Telepathy Tubes support.")
|
|
|
74b83a |
|
|
|
74b83a |
@@ -35,8 +38,6 @@
|
|
|
74b83a |
include_directories ("${CMAKE_CURRENT_BINARY_DIR}/krfb"
|
|
|
74b83a |
"${CMAKE_CURRENT_SOURCE_DIR}/krfb"
|
|
|
74b83a |
"${CMAKE_CURRENT_SOURCE_DIR}/krfb/ui"
|
|
|
74b83a |
- "${CMAKE_CURRENT_SOURCE_DIR}/libvncserver/"
|
|
|
74b83a |
- "${CMAKE_CURRENT_BINARY_DIR}/libvncserver/"
|
|
|
74b83a |
)
|
|
|
74b83a |
|
|
|
74b83a |
if(Q_WS_X11)
|
|
|
74b83a |
@@ -45,9 +46,8 @@
|
|
|
74b83a |
endif(NOT X11_XTest_FOUND)
|
|
|
74b83a |
endif(Q_WS_X11)
|
|
|
74b83a |
|
|
|
74b83a |
-add_subdirectory(libvncserver)
|
|
|
74b83a |
add_subdirectory(krfb)
|
|
|
74b83a |
-add_subdirectory (framebuffers)
|
|
|
74b83a |
+add_subdirectory(framebuffers)
|
|
|
74b83a |
add_subdirectory(doc)
|
|
|
74b83a |
|
|
|
74b83a |
if (NOT INSIDE_KDENETWORK)
|