Author: piumarta Date: 2009-09-08 16:39:44 -0700 (Tue, 08 Sep 2009) New Revision: 2128

Added: trunk/platforms/unix/plugins/ClipboardExtendedPlugin/config.cmake Modified: trunk/platforms/unix/vm/config.cmake Log: do not build clipextplg if x not found

Added: trunk/platforms/unix/plugins/ClipboardExtendedPlugin/config.cmake =================================================================== --- trunk/platforms/unix/plugins/ClipboardExtendedPlugin/config.cmake (rev 0) +++ trunk/platforms/unix/plugins/ClipboardExtendedPlugin/config.cmake 2009-09-08 23:39:44 UTC (rev 2128) @@ -0,0 +1,3 @@ +IF (NOT X11_FOUND) + PLUGIN_DISABLE() +ENDIF ()

Modified: trunk/platforms/unix/vm/config.cmake =================================================================== --- trunk/platforms/unix/vm/config.cmake 2009-09-02 22:13:21 UTC (rev 2127) +++ trunk/platforms/unix/vm/config.cmake 2009-09-08 23:39:44 UTC (rev 2128) @@ -20,6 +20,7 @@

INCLUDE (TestBigEndian) INCLUDE (CheckIncludeFile) +INCLUDE (CheckLibraryExists) INCLUDE (CheckTypeSize) INCLUDE (CheckFunctionExists) INCLUDE (CheckVariableExists) @@ -27,7 +28,9 @@ INCLUDE (FindPkgConfig)

FIND_PACKAGE (X11) -LIST (REMOVE_DUPLICATES X11_INCLUDE_DIR) +IF (X11_FOUND) + LIST (REMOVE_DUPLICATES X11_INCLUDE_DIR) +ENDIF ()

IF (NOT without-gl) FIND_PACKAGE (OpenGL) @@ -52,6 +55,10 @@ ENDIF (X11_FOUND) ENDIF (APPLE AND NOT without-gl)

+IF (NOT OPENGL_FOUND) + SET (OPENGL_INCLUDE_DIR "") +ENDIF () + # FOREACH (var AGL_FOUND AGL_INCLUDE_DIR AGL_LIBRARIES OPENGL_FOUND OPENGL_INCLUDE_DIR OPENGL_LIBRARIES) # MESSAGE ("${var} = ${${var}}") # ENDFOREACH ()