[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kde-workspace] /: pkg-config check for XRandR apparently was not
From:       Dario Freddi <drf () kde ! org>
Date:       2011-09-30 20:23:00
Message-ID: 20110930202300.A56CCA60A6 () git ! kde ! org
[Download RAW message or body]

Git commit 2168b1c8bbef0562dd53e9f5dbdcee9b61491cb5 by Dario Freddi.
Committed on 30/09/2011 at 22:21.
Pushed by dafre into branch 'master'.

pkg-config check for XRandR apparently was not reliable: use check_function_exists instead

M  +4    -7    ConfigureChecks.cmake

http://commits.kde.org/kde-workspace/2168b1c8bbef0562dd53e9f5dbdcee9b61491cb5

diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index b5767b5..34edce2 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -85,10 +85,7 @@ check_type_size("struct ucred" STRUCT_UCRED)       # kio_fonts
 check_function_exists(getpeereid  HAVE_GETPEEREID) # kdesu
 check_function_exists(setpriority  HAVE_SETPRIORITY) # kscreenlocker 
 
-pkg_check_modules (XRANDR_1_2   xrandr>=1.3)
-macro_bool_to_01(XRANDR_1_2_FOUND HAS_RANDR_1_3)
-if (NOT XRANDR_1_2_FOUND)
-   pkg_check_modules (XRANDR_1_2   xrandr>=1.2)
-endif (NOT XRANDR_1_2_FOUND)
-macro_bool_to_01(XRANDR_1_2_FOUND HAS_RANDR_1_2)
-
+set(CMAKE_REQUIRED_INCLUDES ${X11_Xrandr_INCLUDE_PATH}/Xrandr.h)
+set(CMAKE_REQUIRED_LIBRARIES ${X11_Xrandr_LIB})
+check_function_exists(XRRGetScreenResourcesCurrent HAS_RANDR_1_3)
+check_function_exists(XRRGetScreenSizeRange HAS_RANDR_1_2)


[prev in list] [next in list] [prev in thread] [next in thread]