Permalink
Browse files

Merge branch '1.5-stable'

  • Loading branch information...
2 parents 9e42db6 + 2d306d4 commit 7ad64634e04b85c26721980bddb178b0e1158732 @flynd flynd committed Aug 13, 2011
Showing with 5 additions and 9 deletions.
  1. +5 −9 qt4-gui/CMakeLists.txt
View
@@ -28,17 +28,13 @@ set(LIBRARIES)
# Check for X11 and (optional) screensaver support
if (NOT APPLE)
find_package(X11 REQUIRED)
- include_directories(${X11_INCLUDE_DIR})
-
- set(CMAKE_REQUIRED_LIBRARIES ${X11_LIBRARIES})
- check_library_exists(Xss XScreenSaverRegister "" HAVE_LIBXSS)
- check_include_file(X11/extensions/scrnsaver.h HAVE_SCRNSAVER_H)
- set(CMAKE_REQUIRED_LIBRARIES)
- if (HAVE_SCRNSAVER_H AND HAVE_LIBXSS)
- set(X11_LIBRARIES ${X11_LIBRARIES} Xss)
+ if (X11_Xscreensaver_FOUND)
+ set(X11_LIBRARIES ${X11_LIBRARIES} ${X11_Xscreensaver_LIB})
set(USE_SCRNSAVER 1)
- endif (HAVE_SCRNSAVER_H AND HAVE_LIBXSS)
+ endif (X11_Xscreensaver_FOUND)
+
+ include_directories(${X11_INCLUDE_DIR})
set(LIBRARIES ${LIBRARIES} ${X11_LIBRARIES})
endif (NOT APPLE)

0 comments on commit 7ad6463

Please sign in to comment.