|
From: <ai...@us...> - 2011-03-20 04:45:42
|
Revision: 11661
http://plplot.svn.sourceforge.net/plplot/?rev=11661&view=rev
Author: airwin
Date: 2011-03-20 04:45:35 +0000 (Sun, 20 Mar 2011)
Log Message:
-----------
The external qt device does not work well (qt_example hangs,
segfaults, and valgrind shows lots of memory management issues) when
dynamic devices are disabled so disable the external qt device for
that case.
Modified Paths:
--------------
trunk/cmake/modules/qt.cmake
Modified: trunk/cmake/modules/qt.cmake
===================================================================
--- trunk/cmake/modules/qt.cmake 2011-03-20 02:41:13 UTC (rev 11660)
+++ trunk/cmake/modules/qt.cmake 2011-03-20 04:45:35 UTC (rev 11661)
@@ -51,6 +51,17 @@
# PYQT_SIP_DIR - sip system directory
# PYQT_SIP_FLAGS - sip command flags
+# valgrind shows severe memory management problems with qt_example and
+# qt_example either segfaults or hangs when ENABLE_DYNDRIVERS is OFF.
+# I presume this is due to some linking issue for that case, but for
+# now disable PLD_extqt when ENABLE_DYNDRIVERS is OFF until someone can
+# investigate this issue further.
+
+if(PLD_extqt AND NOT ENABLE_DYNDRIVERS)
+ message(STATUS "WARNING: ENABLE_DYNDRIVERS is OFF so force PLD_extqt to be OFF")
+ set(PLD_extqt OFF CACHE BOOL "Enable Qt ext device" FORCE)
+endif(PLD_extqt AND NOT ENABLE_DYNDRIVERS)
+
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 OR PLD_memqt)
set(ANY_QT_DEVICE ON)
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 OR PLD_memqt)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|