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

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

Revision: 12854
          http://sourceforge.net/p/plplot/code/12854
Author:   airwin
Date:     2013-12-12 18:03:36 +0000 (Thu, 12 Dec 2013)
Log Message:
-----------
Fix one issue recently reported by Phil Rosenberg; -DENABLE_qt=OFF now
skips everything to do with Qt detection.

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

Modified: trunk/cmake/modules/qt.cmake
===================================================================
--- trunk/cmake/modules/qt.cmake	2013-12-11 20:35:24 UTC (rev 12853)
+++ trunk/cmake/modules/qt.cmake	2013-12-12 18:03:36 UTC (rev 12854)
@@ -69,6 +69,50 @@
   endif(NOT CMAKE_CXX_COMPILER_WORKS)
 endif(ANY_QT_DEVICE)
 
+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)
+
+# ENABLE_qt depends on PLD_extqt
+if(NOT ANY_QT_DEVICE)
+    set(PLD_extqt OFF CACHE BOOL "Enable Qt ext device" FORCE)
+endif(NOT ANY_QT_DEVICE)
+
+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)
+
+# All qt devices depend on ENABLE_qt
+if(NOT ENABLE_qt)
+  message(STATUS
+    "WARNING: ENABLE_qt is OFF so "
+    "setting all qt devices to OFF."
+    )
+  set(ANY_QT_DEVICE OFF)
+endif(NOT ENABLE_qt)
+
+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)
+    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(PLD_memqt OFF CACHE BOOL "Enable Qt mem device" FORCE)
+endif(NOT ANY_QT_DEVICE)
+
 if(ANY_QT_DEVICE)
   # Use a minimum version corresponding to the version installed by
   # Debian Wheezy.  I assume all other non-enterprise Linux distros
@@ -117,50 +161,6 @@
   endif(QT4_FOUND)
 endif(ANY_QT_DEVICE)
 
-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)
-
-# ENABLE_qt depends on PLD_extqt
-if(NOT ANY_QT_DEVICE)
-    set(PLD_extqt OFF CACHE BOOL "Enable Qt ext device" FORCE)
-endif(NOT ANY_QT_DEVICE)
-
-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)
-
-# All qt devices depend on ENABLE_qt
-if(NOT ENABLE_qt)
-  message(STATUS
-    "WARNING: ENABLE_qt is OFF so "
-    "setting all qt devices to OFF."
-    )
-  set(ANY_QT_DEVICE OFF)
-endif(NOT ENABLE_qt)
-
-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)
-    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(PLD_memqt OFF CACHE BOOL "Enable Qt mem device" FORCE)
-endif(NOT ANY_QT_DEVICE)
-
 if(ENABLE_pyqt4 AND NOT ENABLE_python)
   message(STATUS
     "WARNING: ENABLE_python is OFF so "

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