blob: 76d5c4ed64398c9eb3dc256a99a215d7f7bc43ba (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
|
--- workspace/CMakeLists.txt (revision 767202)
+++ workspace/CMakeLists.txt (working copy)
@@ -16,8 +16,6 @@
include (MacroLibrary)
include (KDE4Defaults)
-macro_optional_find_package(OpenGL)
-
include(ConfigureChecks.cmake)
configure_file(config-unix.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-unix.h )
configure_file(config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h )
--- workspace/kcontrol/screensaver/CMakeLists.txt (revision 766878)
+++ workspace/kcontrol/screensaver/CMakeLists.txt (working copy)
@@ -1,5 +1,7 @@
+if(WITH_OpenGL)
check_library_exists(GL glXChooseVisual "" HAVE_GLXCHOOSEVISUAL)
+endif(WITH_OpenGL)
configure_file (config-screensaver.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-screensaver.h )
add_definitions (-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS)
--- workspace/krunner/lock/CMakeLists.txt (revision 766878)
+++ workspace/krunner/lock/CMakeLists.txt (working copy)
@@ -5,7 +5,9 @@
########### next target ###############
check_library_exists(Xxf86misc XF86MiscSetGrabKeysState "" HAVE_XF86MISCSETGRABKEYSSTATE)
+if(WITH_OpenGL)
check_library_exists(GL glXChooseVisual "" HAVE_GLXCHOOSEVISUAL)
+endif(WITH_OpenGL)
configure_file(config-krunner-lock.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-krunner-lock.h)
|
GitWeb
