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

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

Revision: 10086
          http://plplot.svn.sourceforge.net/plplot/?rev=10086&view=rev
Author:   airwin
Date:     2009-06-28 08:26:11 +0000 (Sun, 28 Jun 2009)

Log Message:
-----------
Disable pyqt4 if qt disabled.  Tried to do this before, but the CMake syntax
was not correct.

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

Modified: trunk/cmake/modules/qt.cmake
===================================================================
--- trunk/cmake/modules/qt.cmake	2009-06-28 08:24:33 UTC (rev 10085)
+++ trunk/cmake/modules/qt.cmake	2009-06-28 08:26:11 UTC (rev 10086)
@@ -105,14 +105,22 @@
   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)
+if(ENABLE_pyqt4 AND NOT ENABLE_python)
   message(STATUS
-    "WARNING: ENABLE_python OR ENABLE_qt is OFF so "
+    "WARNING: ENABLE_python 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)
+endif(ENABLE_pyqt4 AND NOT ENABLE_python)
 
+if(ENABLE_pyqt4 AND NOT ENABLE_qt)
+  message(STATUS
+    "WARNING: 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_qt)
+
 if(ENABLE_qt)
   set(qt_gui_true "")
 else(ENABLE_qt)


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