alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "don't check for X11 on OSX"

Browse Source 
This reverts commit fd01ee364b.
This commit is contained in:
Marco Martin 2015-03-12 10:52:09 +01:00
parent fd01ee364b
commit d3dd3d58e1
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
CMakeLists.txt
View File

@ -67,23 +67,21 @@ set_package_properties(KF5DocTools PROPERTIES DESCRIPTION "Tools to generate doc
) )
#optional features #optional features
if (NOT APPLE) find_package(X11 MODULE)
find_package(X11 MODULE) set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries"
set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries" URL "http://www.x.org"
URL "http://www.x.org" TYPE OPTIONAL
TYPE OPTIONAL )
) find_package(XCB MODULE COMPONENTS XCB COMPOSITE DAMAGE SHAPE XFIXES RENDER)
find_package(XCB MODULE COMPONENTS XCB COMPOSITE DAMAGE SHAPE XFIXES RENDER) set_package_properties(XCB PROPERTIES DESCRIPTION "X protocol C-language Binding"
set_package_properties(XCB PROPERTIES DESCRIPTION "X protocol C-language Binding" URL "http://xcb.freedesktop.org"
URL "http://xcb.freedesktop.org" TYPE OPTIONAL
TYPE OPTIONAL )
) if(X11_FOUND AND XCB_XCB_FOUND)
if(X11_FOUND AND XCB_XCB_FOUND) set(HAVE_X11 1)
set(HAVE_X11 1) find_package(Qt5 REQUIRED NO_MODULE COMPONENTS X11Extras)
find_package(Qt5 REQUIRED NO_MODULE COMPONENTS X11Extras) #X11_Xrender discovery is done by FindX11
#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")
#add_feature_info("X Rendering Extension (libXrender)" X11_Xrender_FOUND "Support for compositing, rendering operations, and alpha-blending. STRONGLY RECOMMENDED")
endif()
endif() endif()
#FIXME: when we have a qca for qt5, reenable #FIXME: when we have a qca for qt5, reenable