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

[<sm...@us...>]

Revision: 9733
          http://plplot.svn.sourceforge.net/plplot/?rev=9733&view=rev
Author:   smekal
Date:     2009-03-13 12:07:06 +0000 (Fri, 13 Mar 2009)

Log Message:
-----------
If qt is not found cmake will error out, since QT_VERSION_MINOR is not defined. Move if(QT4_FOUND) before we use anything qt specific.

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

Modified: trunk/cmake/modules/qt.cmake
===================================================================
--- trunk/cmake/modules/qt.cmake	2009-03-12 23:48:33 UTC (rev 9732)
+++ trunk/cmake/modules/qt.cmake	2009-03-13 12:07:06 UTC (rev 9733)
@@ -38,11 +38,11 @@
 
 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)
-  if(PLD_svgqt AND ${QT_VERSION_MINOR} GREATER 2)
-    set(QT_USE_QTSVG 1)
-  endif(PLD_svgqt AND ${QT_VERSION_MINOR} GREATER 2)
-  include(${QT_USE_FILE})
   if(QT4_FOUND)
+		if(PLD_svgqt AND ${QT_VERSION_MINOR} GREATER 2)
+			set(QT_USE_QTSVG 1)
+		endif(PLD_svgqt AND ${QT_VERSION_MINOR} GREATER 2)
+		include(${QT_USE_FILE})
     set(qt_COMPILE_FLAGS)
     foreach(DIR ${QT_INCLUDES})
       set(qt_COMPILE_FLAGS "${qt_COMPILE_FLAGS} -I${DIR}")


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