From c89be21c71010c28bf993bf4f33f4cfd15998b7a Mon Sep 17 00:00:00 2001 From: Bernhard Miklautz Date: Mon, 17 Jun 2013 11:13:14 +0200 Subject: [PATCH 1/2] build: use uppercase XRENDER_FOUND FIND_PACKAGE_HANDLE_STANDARD_ARGS sets _FOUND --- cmake/FindXrender.cmake | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cmake/FindXrender.cmake b/cmake/FindXrender.cmake index 5264604df..461217578 100644 --- a/cmake/FindXrender.cmake +++ b/cmake/FindXrender.cmake @@ -26,18 +26,18 @@ # limitations under the License. #============================================================================= -find_path(Xrender_INCLUDE_DIR NAMES X11/extensions/Xrender.h +find_path(XRENDER_INCLUDE_DIR NAMES X11/extensions/Xrender.h DOC "The Xrender include directory") -find_library(Xrender_LIBRARY NAMES Xrender +find_library(XRENDER_LIBRARY NAMES Xrender DOC "The Xrender library") include(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(Xrender DEFAULT_MSG Xrender_LIBRARY Xrender_INCLUDE_DIR) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(Xrender DEFAULT_MSG XRENDER_LIBRARY XRENDER_INCLUDE_DIR) -if(Xrender_FOUND) - set(XRENDER_LIBRARIES ${Xrender_LIBRARY}) - set(XRENDER_INCLUDE_DIRS ${Xrender_INCLUDE_DIR}) +if(XRENDER_FOUND) + set(XRENDER_LIBRARIES ${XRENDER_LIBRARY}) + set(XRENDER_INCLUDE_DIRS ${XRENDER_INCLUDE_DIR}) endif() mark_as_advanced(XRENDER_INCLUDE_DIRS XRENDER_LIBRARIES) From bcef9317552a78f0e247513beaac8b28a6cf3970 Mon Sep 17 00:00:00 2001 From: Bernhard Miklautz Date: Mon, 17 Jun 2013 11:14:25 +0200 Subject: [PATCH 2/2] build: changed X11_FEATURE_TYPE to optional on osX If X11_FEATURE_TYPE is disables on mac xfreerdp can't be build properly. Setting it to optional allows to enable X11 builds with -DWITH_X11 --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ca6e154b0..5d7f01312 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -318,8 +318,9 @@ if(APPLE) set(DIRECTFB_FEATURE_TYPE "DISABLED") set(FFMPEG_FEATURE_TYPE "OPTIONAL") set(GSTREAMER_FEATURE_TYPE "OPTIONAL") - set(X11_FEATURE_TYPE "DISABLED") + set(X11_FEATURE_TYPE "OPTIONAL") if(IOS) + set(X11_FEATURE_TYPE "DISABLED") set(ALSA_FEATURE_TYPE "DISABLED") set(PULSE_FEATURE_TYPE "DISABLED") set(CUPS_FEATURE_TYPE "DISABLED")