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

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

Revision: 10183
          http://plplot.svn.sourceforge.net/plplot/?rev=10183&view=rev
Author:   airwin
Date:     2009-07-28 04:53:59 +0000 (Tue, 28 Jul 2009)

Log Message:
-----------
Simplify the implementation of the qt device logic.

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

Modified: trunk/cmake/modules/qt.cmake
===================================================================
--- trunk/cmake/modules/qt.cmake	2009-07-27 18:16:35 UTC (rev 10182)
+++ trunk/cmake/modules/qt.cmake	2009-07-28 04:53:59 UTC (rev 10183)
@@ -59,16 +59,6 @@
     message(STATUS "WARNING: no working C++ compiler so "
       "disabling all qt devices."
       )
-    set(PLD_bmpqt OFF CACHE BOOL "Enable Qt Windows bmp device" FORCE)
-    set(PLD_jpgqt OFF CACHE BOOL "Enable Qt jpg device" FORCE)
-    set(PLD_pngqt OFF CACHE BOOL "Enable Qt png device" FORCE)
-    set(PLD_ppmqt OFF CACHE BOOL "Enable Qt ppm device" FORCE)
-    set(PLD_tiffqt OFF CACHE BOOL "Enable Qt tiff device" FORCE)
-    set(PLD_epsqt OFF CACHE BOOL "Enable Qt EPS device" FORCE)
-    set(PLD_pdfqt OFF CACHE BOOL "Enable Qt PDF device" FORCE)
-    set(PLD_qtwidget OFF CACHE BOOL "Enable Qt interactive device" FORCE)
-    set(PLD_svgqt OFF CACHE BOOL "Enable Qt SVG device" FORCE)
-    set(PLD_extqt OFF CACHE BOOL "Enable Qt ext device" FORCE)
     set(ANY_QT_DEVICE OFF)
   endif(NOT CMAKE_CXX_COMPILER_WORKS)
 endif(ANY_QT_DEVICE)
@@ -95,6 +85,11 @@
     #message("qt_LIBRARY_DIR = ${qt_LIBRARY_DIR}")
   else(QT4_FOUND AND QT_LIBRARIES)
     message(STATUS "QT_LIBRARIES not found so disabling all qt devices")
+    set(ANY_QT_DEVICE OFF)
+  endif(QT4_FOUND AND QT_LIBRARIES)
+endif(ANY_QT_DEVICE)
+
+if(NOT ANY_QT_DEVICE)
     set(PLD_bmpqt OFF CACHE BOOL "Enable Qt Windows bmp device" FORCE)
     set(PLD_jpgqt OFF CACHE BOOL "Enable Qt jpg device" FORCE)
     set(PLD_pngqt OFF CACHE BOOL "Enable Qt png device" FORCE)
@@ -105,8 +100,7 @@
     set(PLD_qtwidget OFF CACHE BOOL "Enable Qt interactive device" FORCE)
     set(PLD_svgqt OFF CACHE BOOL "Enable Qt SVG device" FORCE)
     set(PLD_extqt OFF CACHE BOOL "Enable Qt ext device" FORCE)
-  endif(QT4_FOUND AND QT_LIBRARIES)
-endif(ANY_QT_DEVICE)
+endif(NOT ANY_QT_DEVICE)
 
 if(DEFAULT_NO_BINDINGS)
   option(ENABLE_qt "Enable Qt bindings" OFF)
@@ -206,4 +200,3 @@
   # COMMAND will work properly with these flags later on.
   string(REGEX REPLACE " " ";"PYQT_SIP_FLAGS "${PYQT_SIP_FLAGS}") 
 endif(ENABLE_pyqt4)
-


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