Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2025-02-05 05:28:32 +00:00
Code Issues Releases Activity

Fix x11 check in cmake

Browse Source
This commit is contained in:
Nikolas Garofil 2010-10-27 07:37:11 +02:00
parent 11e5db2132
commit 89a8456495
2 changed files with 39 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmake/ConkyPlatformChecks.cmake
View File

@ -166,6 +166,7 @@ endif(BUILD_ICONV)
if(BUILD_X11)
include(FindX11)
find_package(X11)
if(X11_FOUND)
set(conky_includes ${conky_includes} ${X11_INCLUDE_DIR})
set(conky_libs ${conky_libs} ${X11_LIBRARIES})
@ -204,7 +205,9 @@ if(BUILD_X11)
endif(NOT X11_Xext_FOUND)
set(conky_libs ${conky_libs} ${X11_Xext_LIB})
endif(BUILD_XDBE)
else(X11_FOUND)
message(FATAL_ERROR "Unable to find X11 library")
endif(X11_FOUND)
endif(BUILD_X11)
if(BUILD_LUA)

1
src/x11.h
View File

@ -27,7 +27,6 @@
#ifndef X11_H_
#define X11_H_
#include <X11/Xlib.h>
#include <X11/Xlib.h>
#include <X11/Xatom.h>