[Plplot-cvs] plplot/cmake/modules FindVGA.cmake, NONE, 1.1 linuxvga.cmake, NONE, 1.1 drivers-init.cmake, 1.7, 1.8 drivers.cmake, 1.13, 1.14

[Alan W. I. <ai...@us...>]

Update of /cvsroot/plplot/plplot/cmake/modules
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2064

Modified Files:
	drivers-init.cmake drivers.cmake 
Added Files:
	FindVGA.cmake linuxvga.cmake 
Log Message:
Implement linuxvga device driver for our CBS.  To make this work on Debian
stable I built against the libsvga1-dev package (this is the only alternative
since there are no development versions of svgalib1-libggi2, the SVGA library
interface to LibGGI).  The result worked only if you were in the root account.
The colours were not correct (the red lines of the examples came out blue) and
software fill had to be used.  Because of these problems and constraints
I have disabled this device by default (although the user can override that
if they really, really want it for some reason).  In retrospect, I should have
taken this opportunity to permanently retire this device, but so it goes.


--- NEW FILE: linuxvga.cmake ---
# cmake/modules/linuxvga.cmake
#
# Copyright (C) 2006  Alan W. Irwin
#
# This file is part of PLplot.
#
# PLplot is free software; you can redistribute it and/or modify
# it under the terms of the GNU Library General Public License as published
# by the Free Software Foundation; version 2 of the License.
#
# PLplot is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
# GNU Library General Public License for more details.
#
# You should have received a copy of the GNU Library General Public License
# along with the file PLplot; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA

# Configuration for the linuxvga device driver (supporting the linuxvga
# device).
#
# The following variables are set / modified
#
# PLD_linuxvga            - ON means the linuxvga device is enabled.
# linuxvga_COMPILE_FLAGS  - COMPILE_FLAGS (string) required to compile linuxvga
# 		  	    device driver.
# linuxvga_LINK_FLAGS     - LINK_FLAGS (string) for dynamic linuxvga device
# 			    driver.
# DRIVERS_LINK_FLAGS - list of LINK_FLAGS for all static device drivers.
#
# Include file searches use FindPath. To add extra search directories
# set the environment variable CMAKE_INCLUDE_PATH.
# Library searches use FindLibrary. To add extra search directories
# set the environment variable CMAKE_LIBRARY_PATH.
# See cmake documentation for further details.

if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
  if(PLD_linuxvga)
    find_package(VGA)
    if(VGA_FOUND)
      set(linuxvga_COMPILE_FLAGS "-I${VGA_INCLUDE_DIRS}")
      set(linuxvga_LINK_FLAGS "-L${VGA_LIBRARY_DIRS} -lvga")
      set(DRIVERS_LINK_FLAGS ${DRIVERS_LINK_FLAGS} ${linuxvga_LINK_FLAGS})
    else(VGA_FOUND)
      message(STATUS 
      "WARNING: vga.h and/or the vga library not found.\n"
      "Setting PLD_linuxvga to OFF."
      )
      set(PLD_linuxvga OFF CACHE BOOL "Enable linuxvga device" FORCE)    
    endif(VGA_FOUND)
  endif(PLD_linuxvga)
endif(CMAKE_SYSTEM_NAME STREQUAL "Linux")

Index: drivers.cmake
===================================================================
RCS file: /cvsroot/plplot/plplot/cmake/modules/drivers.cmake,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- drivers.cmake	1 Aug 2006 19:00:47 -0000	1.13
+++ drivers.cmake	1 Aug 2006 22:36:05 -0000	1.14
@@ -72,7 +72,7 @@
 include(gd)
 # Do not implement gnome which is superseded by gcw
 #include(gnome)
-#include(linuxvga)
+include(linuxvga)
 include(xwin)
 #include(tk)
 include(psttf)

Index: drivers-init.cmake
===================================================================
RCS file: /cvsroot/plplot/plplot/cmake/modules/drivers-init.cmake,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- drivers-init.cmake	1 Aug 2006 19:00:47 -0000	1.7
+++ drivers-init.cmake	1 Aug 2006 22:36:05 -0000	1.8
@@ -74,7 +74,9 @@
 "hp7470:hpgl:ON" "hp7580:hpgl:ON" "lj_hpgl:hpgl:ON"
 "imp:impress:OFF"
 "gcw:gcw:ON"
-#"linuxvga:linuxvga:ON"
+# Default off because poorly maintained (colours are incorrect)
+# must use software fill, and must run as root.
+"linuxvga:linuxvga:OFF"
 "ljii:ljii:OFF"
 "ljiip:ljiip:OFF"
 "mem:mem:ON"

--- NEW FILE: FindVGA.cmake ---
# Find vga-related library information for Linux

# This module defines the following uncached variables:
#  VGA_FOUND, if false, do not try to use VGA.
#  VGA_INCLUDE_DIRS, where to find vga.h.
#  VGA_LIBRARIES, the libraries to link against to use the vga library
#  VGA_LIBRARY_DIRS, the directory where the vga library is found.

if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
find_path(VGA_INCLUDE_DIR vga.h /usr/local/include /usr/include)

if(VGA_INCLUDE_DIR)
  find_library(VGA_LIBRARY
  NAMES vga
  PATHS /usr/local/lib /usr/lib
  )
  if(VGA_LIBRARY)
    set(VGA_LIBRARY_DIR "")
    get_filename_component(VGA_LIBRARY_DIRS ${VGA_LIBRARY} PATH)
    # Set uncached variables as per standard.
    set(VGA_FOUND ON)
    set(VGA_INCLUDE_DIRS ${VGA_INCLUDE_DIR})
    set(VGA_LIBRARIES ${VGA_LIBRARY})
  endif(VGA_LIBRARY)
endif(VGA_INCLUDE_DIR)
	    
if(VGA_FOUND)
  if(NOT VGA_FIND_QUIETLY)
    message(STATUS "FindVGA: Found both vga.h and the vga library")
  endif(NOT VGA_FIND_QUIETLY)
else(VGA_FOUND)
  if(VGA_FIND_REQUIRED)
    message(FATAL_ERROR "FindVGA: Could not find vga.h and/or the vga library")
  endif(VGA_FIND_REQUIRED)
endif(VGA_FOUND)
endif(CMAKE_SYSTEM_NAME STREQUAL "Linux")