From d3dd3d58e153379f33dcaca4d3d35ff9034db02a Mon Sep 17 00:00:00 2001 From: Marco Martin Date: Thu, 12 Mar 2015 10:52:09 +0100 Subject: [PATCH] Revert "don't check for X11 on OSX" This reverts commit fd01ee364b9726a3827be0a000f97dc549cd3e86. --- CMakeLists.txt | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0052e9957..d311067a5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -67,23 +67,21 @@ set_package_properties(KF5DocTools PROPERTIES DESCRIPTION "Tools to generate doc ) #optional features -if (NOT APPLE) - find_package(X11 MODULE) - set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries" - URL "http://www.x.org" - TYPE OPTIONAL - ) - find_package(XCB MODULE COMPONENTS XCB COMPOSITE DAMAGE SHAPE XFIXES RENDER) - set_package_properties(XCB PROPERTIES DESCRIPTION "X protocol C-language Binding" - URL "http://xcb.freedesktop.org" - TYPE OPTIONAL - ) - if(X11_FOUND AND XCB_XCB_FOUND) - set(HAVE_X11 1) - find_package(Qt5 REQUIRED NO_MODULE COMPONENTS X11Extras) - #X11_Xrender discovery is done by FindX11 - #add_feature_info("X Rendering Extension (libXrender)" X11_Xrender_FOUND "Support for compositing, rendering operations, and alpha-blending. STRONGLY RECOMMENDED") - endif() +find_package(X11 MODULE) +set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries" + URL "http://www.x.org" + TYPE OPTIONAL + ) +find_package(XCB MODULE COMPONENTS XCB COMPOSITE DAMAGE SHAPE XFIXES RENDER) +set_package_properties(XCB PROPERTIES DESCRIPTION "X protocol C-language Binding" + URL "http://xcb.freedesktop.org" + TYPE OPTIONAL + ) +if(X11_FOUND AND XCB_XCB_FOUND) + set(HAVE_X11 1) + find_package(Qt5 REQUIRED NO_MODULE COMPONENTS X11Extras) + #X11_Xrender discovery is done by FindX11 + #add_feature_info("X Rendering Extension (libXrender)" X11_Xrender_FOUND "Support for compositing, rendering operations, and alpha-blending. STRONGLY RECOMMENDED") endif() #FIXME: when we have a qca for qt5, reenable