From 46a6195f3c2db3bdab40b39c2254577bbe1d8ad0 Mon Sep 17 00:00:00 2001 From: uwolfer Date: Mon, 23 Jul 2007 20:44:37 +0000 Subject: [PATCH] merge in my changes from soc-krdc branch git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/KDE/kdenetwork@691516 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- cmake/modules/FindLibVNCServer.cmake | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/cmake/modules/FindLibVNCServer.cmake b/cmake/modules/FindLibVNCServer.cmake index b4e21e5e3..c792289e3 100644 --- a/cmake/modules/FindLibVNCServer.cmake +++ b/cmake/modules/FindLibVNCServer.cmake @@ -1,6 +1,7 @@ # cmake macro to test LIBVNCSERVER LIB # Copyright (c) 2006, Alessandro Praduroux +# Copyright (c) 2007, Urs Wolfer # # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. @@ -11,11 +12,16 @@ if (LIBVNCSERVER_INCLUDE_DIR) set(LibVNCServer_FIND_QUIETLY TRUE) endif (LIBVNCSERVER_INCLUDE_DIR) - FIND_PATH(LIBVNCSERVER_INCLUDE_DIR rfb/rfb.h) FIND_LIBRARY(LIBVNCSERVER_LIBRARIES NAMES vncserver libvncserver) +# libvncserver and libvncclient are in the same package, so it does +# not make sense to add a new cmake script for finding libvncclient. +# instead just find the libvncclient also in this file. +FIND_PATH(LIBVNCCLIENT_INCLUDE_DIR rfb/rfbclient.h) +FIND_LIBRARY(LIBVNCCLIENT_LIBRARIES NAMES vncclient libvncclient) + if (LIBVNCSERVER_LIBRARIES AND LIBVNCSERVER_INCLUDE_DIR) set(LIBVNCSERVER_FOUND TRUE) endif (LIBVNCSERVER_LIBRARIES AND LIBVNCSERVER_INCLUDE_DIR) -- 2.11.4.GIT