Move the Xinerama test to main ConfigureChecks.cmake

5 files changed, 32 insertions, 21 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cddd67ff4..42f8d341c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -115,7 +115,7 @@ option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden"
 # WITH_LIBART       affects tdm kcontrol(icons background)
 # WITH_LIBUSB       affects kcontrol(input)
 # WITH_XDMCP        affects tdm
-# WITH_XINERAMA     affects ksplashml
+# WITH_XINERAMA     affects ksplashml twin/compton-tde
 # WITH_ARTS         affects libkonq khotkeys
 # WITH_I8K          affects ksysguard
 # WITH_SENSORS      affects ksysguard
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 34aff70fb..f89bfa09f 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -83,7 +83,7 @@ if( WITH_XRENDER OR BUILD_KDESKTOP OR BUILD_KONSOLE OR BUILD_KCONTROL OR BUILD_K
 endif( )
 
 
-# xrandr (kcontrol)
+# xrandr (kcontrol, twin/compot-tde)
 if( WITH_XRANDR )
   pkg_search_module( XRANDR xrandr )
   if( NOT XRANDR_FOUND )
@@ -92,6 +92,17 @@ if( WITH_XRANDR )
 endif( )
 
 
+# xinerama (ksplashml, twin/compot-tde)
+if( WITH_XINERAMA )
+  pkg_search_module( XINERAMA xinerama )
+  if( XINERAMA_FOUND )
+    set( HAVE_XINERAMA 1 )
+  else( )
+    tde_message_fatal( "xinerama is requested, but not found on your system" )
+  endif( )
+endif( WITH_XINERAMA )
+
+
 # xcursor (tdeioslave, kcontrol)
 if( WITH_XCURSOR )
   pkg_search_module( XCURSOR xcursor )
diff --git a/ksplashml/themeengine/simple/CMakeLists.txt b/ksplashml/themeengine/simple/CMakeLists.txt
index 927f4b507..2b486e4f1 100644
--- a/ksplashml/themeengine/simple/CMakeLists.txt
+++ b/ksplashml/themeengine/simple/CMakeLists.txt
@@ -9,18 +9,6 @@
 #
 #################################################
 
-if( WITH_XINERAMA )
-  check_include_file( "X11/extensions/Xinerama.h" X11_EXTENSIONS_XINERAMA_H )
-  if( X11_EXTENSIONS_XINERAMA_H )
-    check_library_exists( Xinerama XineramaQueryExtension "" HAVE_XINERAMA )
-  endif( X11_EXTENSIONS_XINERAMA_H )
-  if( NOT HAVE_XINERAMA )
-    tde_message_fatal( "xinerama are requested, but not found on your system" )
-  endif( NOT HAVE_XINERAMA )
-  set( XINERAMA_LIBRARY Xinerama )
-endif( WITH_XINERAMA )
-
-
 include_directories(
   ${CMAKE_BINARY_DIR}
   ${TQT_INCLUDE_DIRS}
@@ -35,6 +23,6 @@ link_directories(
 
 tde_add_executable( ksplashsimple
   SOURCES main.cpp
-  LINK ${TQT_LIBRARIES} X11 ${XINERAMA_LIBRARY}
+  LINK ${TQT_LIBRARIES} X11 ${XINERAMA_LIBRARIES}
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/twin/compton-tde/CMakeLists.txt b/twin/compton-tde/CMakeLists.txt
index f73f09ee5..6a2d71339 100644
--- a/twin/compton-tde/CMakeLists.txt
+++ b/twin/compton-tde/CMakeLists.txt
@@ -31,6 +31,8 @@ include_directories(
 #  WITH_XINNERAMA         -> CONFIG_XINERAMA
 #  WITH_OPENGL            -> CONFIG_VSYNC_OPENGL
 #  WITH_OPENGL            -> CONFIG_VSYNC_OPENGL_GLSL
+#  WITH_OPENGL            -> CONFIG_VSYNC_OPENGL_FBO
+#  WITH_OPENGL            -> CONFIG_GLX_XSYNC
 #  WITH_PCRE              -> CONFIG_REGEX_PCRE
 #  WITH_PCRE              -> CONFIG_REGEX_PCRE_JIT
 #  WITH_LIBCONFIG         -> CONFIG_LIBCONFIG
@@ -50,6 +52,8 @@ set( compton_SRCS compton.c )
 if( WITH_OPENGL )
   set( CONFIG_VSYNC_OPENGL      ${WITH_OPENGL} )
   set( CONFIG_VSYNC_OPENGL_GLSL ${WITH_OPENGL} )
+  set( CONFIG_VSYNC_OPENGL_FBO  ${WITH_OPENGL} )
+  set( CONFIG_GLX_XSYNC         ${WITH_OPENGL} )
   list( APPEND compton_LIBRARIES ${GL_LIBRARIES})
   list( APPEND compton_SRCS opengl.c )
 endif( )
diff --git a/twin/compton-tde/compton_config.h.cmake b/twin/compton-tde/compton_config.h.cmake
index 91cfad3be..06db4caf4 100644
--- a/twin/compton-tde/compton_config.h.cmake
+++ b/twin/compton-tde/compton_config.h.cmake
@@ -6,23 +6,31 @@
 // Whether to enable JIT support of libpcre. This may cause problems on PaX
 // kernels.
 #cmakedefine CONFIG_REGEX_PCRE_JIT 1
+
 // Whether to enable parsing of configuration files using libconfig.
 #cmakedefine CONFIG_LIBCONFIG 1
 // Whether we are using a legacy version of libconfig (1.3.x).
 #cmakedefine CONFIG_LIBCONFIG_LEGACY 1
+
 // Whether to enable DRM VSync support
 #cmakedefine CONFIG_VSYNC_DRM 1
-// Whether to enable OpenGL support
-#cmakedefine CONFIG_VSYNC_OPENGL 1
-// Whether to enable GLX GLSL support
-#cmakedefine CONFIG_VSYNC_OPENGL_GLSL 1
-// Whether to enable GLX FBO support
-#cmakedefine CONFIG_VSYNC_OPENGL_FBO 1
+
 // Whether to enable DBus support with libdbus.
 #define CONFIG_DBUS 1
 // Whether to enable condition support.
 #define CONFIG_C2 1
+
 // Whether to enable X Sync support.
 #define CONFIG_XSYNC 1
+
+// Whether to enable OpenGL support
+#cmakedefine CONFIG_VSYNC_OPENGL 1
+// Whether to enable GLX GLSL support
+#cmakedefine CONFIG_VSYNC_OPENGL_GLSL 1
+// Whether to enable GLX FBO support
+#cmakedefine CONFIG_VSYNC_OPENGL_FBO 1
 // Whether to enable GLX Sync support.
 #cmakedefine CONFIG_GLX_XSYNC 1
+
+// Whether to enable Xinerama support
+#cmakedefine CONFIG_XINERAMA 1