[Plplot-cvs] SF.net SVN: plplot:[10058] trunk/cmake/modules

[<ai...@us...>]

Revision: 10058
          http://plplot.svn.sourceforge.net/plplot/?rev=10058&view=rev
Author:   airwin
Date:     2009-06-22 20:15:01 +0000 (Mon, 22 Jun 2009)

Log Message:
-----------
Handle plplot_pyqt4 logic within qt.cmake.
Implement ENABLE_qt logic.

Modified Paths:
--------------
    trunk/cmake/modules/drivers.cmake
    trunk/cmake/modules/qt.cmake

Removed Paths:
-------------
    trunk/cmake/modules/pyqt4.cmake

Modified: trunk/cmake/modules/drivers.cmake
===================================================================
--- trunk/cmake/modules/drivers.cmake	2009-06-21 19:35:06 UTC (rev 10057)
+++ trunk/cmake/modules/drivers.cmake	2009-06-22 20:15:01 UTC (rev 10058)
@@ -92,7 +92,6 @@
 include(aqt)
 include(wxwidgets)
 include(pdf)
-include(pyqt4)
 
 # Finalize device options.
 include(drivers-finish)

Deleted: trunk/cmake/modules/pyqt4.cmake
===================================================================
--- trunk/cmake/modules/pyqt4.cmake	2009-06-21 19:35:06 UTC (rev 10057)
+++ trunk/cmake/modules/pyqt4.cmake	2009-06-22 20:15:01 UTC (rev 10058)
@@ -1,34 +0,0 @@
-# bindings/python/CMakeLists.txt
-### Process this file with cmake to produce Makefile
-###
-# Copyright (C) 2009 Hazen Babcock
-#
-# 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 PLplot; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
-
-# Options to enable PyQt4 bindings
-if(DEFAULT_NO_BINDINGS)
-  option(ENABLE_pyqt4 "Enable PyQt4 bindings" OFF)
-else(DEFAULT_NO_BINDINGS)
-  option(ENABLE_pyqt4 "Enable PyQt4 bindings" OFF)
-endif(DEFAULT_NO_BINDINGS)
-
-if(NOT ENABLE_python AND NOT PLD_extqt)
-  set(ENABLE_pyqt4 OFF CACHE BOOL "Enable PyQt4 bindings" FORCE)
-endif(NOT ENABLE_python AND NOT PLD_extqt)
-
-if(ENABLE_pyqt4)
-  message(STATUS "Checking for PyQt4")
-endif(ENABLE_pyqt4)

Modified: trunk/cmake/modules/qt.cmake
===================================================================
--- trunk/cmake/modules/qt.cmake	2009-06-21 19:35:06 UTC (rev 10057)
+++ trunk/cmake/modules/qt.cmake	2009-06-22 20:15:01 UTC (rev 10058)
@@ -18,7 +18,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 
 # Module for determining all configuration variables related to the qt
-# device driver.
+# device driver, the plplotqt library, and the plplot_pyqt4 Python extension
+# module.
 # The following variables are set/modified:
 # PLD_bmpqt		  - ON means the bmpqt device is enabled.
 # PLD_jpgqt		  - ON means the jpgqt device is enabled.
@@ -37,6 +38,9 @@
 # qt_RPATH	       	  - RPATH directory list for qt device driver.
 # DRIVERS_LINK_FLAGS  	  - list of device LINK_FLAGS for case
 # 			    when ENABLE_DYNDRIVERS OFF.
+# ENABLE_qt		  - ON means the plplot_qt library is enabled.
+# ENABLE_pyqt4		  - ON means the plplot_pyqt4 Python extension module
+# 			    is enabled.
 
 find_package(Qt4)
 if(PLD_bmpqt OR PLD_jpgqt OR PLD_pngqt OR PLD_ppmqt OR PLD_tiffqt OR PLD_epsqt OR PLD_pdfqt OR PLD_qtwidget OR PLD_svgqt OR PLD_extqt)
@@ -74,8 +78,32 @@
   endif(QT4_FOUND AND QT_LIBRARIES)
 endif(PLD_bmpqt OR PLD_jpgqt OR PLD_pngqt OR PLD_ppmqt OR PLD_tiffqt OR PLD_epsqt OR PLD_pdfqt OR PLD_qtwidget OR PLD_svgqt OR PLD_extqt)
 
-if(PLD_extqt)
+if(DEFAULT_NO_BINDINGS)
+  option(ENABLE_qt "Enable Qt bindings" OFF)
+  option(ENABLE_pyqt4 "Enable pyqt4 Python extension module" OFF)
+else(DEFAULT_NO_BINDINGS)
+  option(ENABLE_qt "Enable Qt bindings" ON)
+  option(ENABLE_pyqt4 "Enable pyqt4 Python extension module" ON)
+endif(DEFAULT_NO_BINDINGS)
+
+if(ENABLE_qt AND NOT PLD_extqt)
+  message(STATUS
+  "WARNING: PLD_extqt is OFF so "
+  "setting ENABLE_qt to OFF."
+  )
+  set(ENABLE_qt OFF CACHE BOOL "Enable Qt bindings" FORCE)
+endif(ENABLE_qt AND NOT PLD_extqt)
+
+if(ENABLE_pyqt4 AND NOT ENABLE_python AND NOT ENABLE_qt)
+  message(STATUS
+  "WARNING: ENABLE_python OR ENABLE_qt is OFF so "
+  "setting ENABLE_pyqt4 to OFF."
+  )
+  set(ENABLE_pyqt4 OFF CACHE BOOL "Enable pyqt4 Python extension module " FORCE)
+endif(ENABLE_pyqt4 AND NOT ENABLE_python AND NOT ENABLE_qt)
+
+if(ENABLE_qt)
   set(qt_gui_true "")
-else(PLD_extqt)
+else(ENABLE_qt)
   set(qt_gui_true "#")
-endif(PLD_extqt)
+endif(ENABLE_qt)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.