From: <ai...@us...> - 2009-03-05 20:04:04
|
Revision: 9677 http://plplot.svn.sourceforge.net/plplot/?rev=9677&view=rev Author: airwin Date: 2009-03-05 20:03:56 +0000 (Thu, 05 Mar 2009) Log Message: ----------- Style changes. Modified Paths: -------------- trunk/cmake/modules/qt.cmake Modified: trunk/cmake/modules/qt.cmake =================================================================== --- trunk/cmake/modules/qt.cmake 2009-03-05 17:35:49 UTC (rev 9676) +++ trunk/cmake/modules/qt.cmake 2009-03-05 20:03:56 UTC (rev 9677) @@ -1,20 +1,20 @@ -FIND_PACKAGE(Qt4) +find_package(Qt4) if(PLD_rasterqt OR PLD_epspdfqt 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(NOT QT4_FOUND) - set(PLD_rasterqt OFF CACHE BOOL "Enable Qt raster device" FORCE) - set(PLD_epspdfqt OFF CACHE BOOL "Enable Qt EPS/PDF device" FORCE) - set(PLD_qtwidget OFF CACHE BOOL "Enable Qt EPS/PDF device" FORCE) - else(NOT QT4_FOUND) - set(qt_COMPILE_FLAGS) - foreach(DIR ${QT_INCLUDES}) - set(qt_COMPILE_FLAGS "${qt_COMPILE_FLAGS} -I${DIR}") - endforeach(DIR ${QT_INCLUDES}) - - set(qt_LINK_FLAGS ${QT_LIBRARIES}) - set(DRIVERS_LINK_FLAGS ${DRIVERS_LINK_FLAGS} ${qt_LINK_FLAGS}) - endif(NOT 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}) + if(NOT QT4_FOUND) + set(PLD_rasterqt OFF CACHE BOOL "Enable Qt raster device" FORCE) + set(PLD_epspdfqt OFF CACHE BOOL "Enable Qt EPS/PDF device" FORCE) + set(PLD_qtwidget OFF CACHE BOOL "Enable Qt EPS/PDF device" FORCE) + else(NOT QT4_FOUND) + set(qt_COMPILE_FLAGS) + foreach(DIR ${QT_INCLUDES}) + set(qt_COMPILE_FLAGS "${qt_COMPILE_FLAGS} -I${DIR}") + endforeach(DIR ${QT_INCLUDES}) + + set(qt_LINK_FLAGS ${QT_LIBRARIES}) + set(DRIVERS_LINK_FLAGS ${DRIVERS_LINK_FLAGS} ${qt_LINK_FLAGS}) + endif(NOT QT4_FOUND) endif(PLD_rasterqt OR PLD_epspdfqt OR PLD_qtwidget OR PLD_svgqt) \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-03-10 16:59:20
|
Revision: 9699 http://plplot.svn.sourceforge.net/plplot/?rev=9699&view=rev Author: airwin Date: 2009-03-10 16:59:15 +0000 (Tue, 10 Mar 2009) Log Message: ----------- Improved comments and style, but the substance is the same. Modified Paths: -------------- trunk/cmake/modules/qt.cmake Modified: trunk/cmake/modules/qt.cmake =================================================================== --- trunk/cmake/modules/qt.cmake 2009-03-10 09:30:50 UTC (rev 9698) +++ trunk/cmake/modules/qt.cmake 2009-03-10 16:59:15 UTC (rev 9699) @@ -1,3 +1,41 @@ +# cmake/modules/qt.cmake +# +# Copyright (C) 2009 Alan W. Irwin +# +# This file is part of PLplot. +# +# PLplot is free software; you can redistribute it and/or modify +# it under the terms of the GNU Library General Public License as published +# by the Free Software Foundation; version 2 of the License. +# +# PLplot is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public License +# along with the file PLplot; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +# Module for determining all configuration variables related to the qt +# device driver. +# The following variables are set/modified: +# PLD_bmpqt - ON means the bmpqt device is enabled. +# PLD_jpgqt - ON means the jpgqt device is enabled. +# PLD_pngqt - ON means the pngqt device is enabled. +# PLD_ppmqt - ON means the ppmqt device is enabled. +# PLD_tiffqt - ON means the tiffqt device is enabled. +# PLD_epsqt - ON means the epsqt device is enabled. +# PLD_pdfqt - ON means the pdfqt device is enabled. +# PLD_qtwidget - ON means the qtwidget device is enabled. +# PLD_svgqt - ON means the svgqt device is enabled. +# qt_COMPILE_FLAGS - individual COMPILE_FLAGS required to compile wxwidgets +# device. +# qt_LINK_FLAGS - list of full path names of libraries and +# linker flags for dynamic wxwidgets device driver. +# DRIVERS_LINK_FLAGS - list of device LINK_FLAGS for case +# when ENABLE_DYNDRIVERS OFF. + 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) @@ -4,7 +42,16 @@ set(QT_USE_QTSVG 1) endif(PLD_svgqt AND ${QT_VERSION_MINOR} GREATER 2) include(${QT_USE_FILE}) - if(NOT QT4_FOUND) + if(QT4_FOUND) + set(qt_COMPILE_FLAGS) + foreach(DIR ${QT_INCLUDES}) + set(qt_COMPILE_FLAGS "${qt_COMPILE_FLAGS} -I${DIR}") + endforeach(DIR ${QT_INCLUDES}) + + set(qt_LINK_FLAGS ${QT_LIBRARIES}) + #message("qt_LINK_FLAGS = ${qt_LINK_FLAGS}") + set(DRIVERS_LINK_FLAGS ${DRIVERS_LINK_FLAGS} ${qt_LINK_FLAGS}) + else(QT4_FOUND) 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) @@ -14,13 +61,5 @@ 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) - else(NOT QT4_FOUND) - set(qt_COMPILE_FLAGS) - foreach(DIR ${QT_INCLUDES}) - set(qt_COMPILE_FLAGS "${qt_COMPILE_FLAGS} -I${DIR}") - endforeach(DIR ${QT_INCLUDES}) - - set(qt_LINK_FLAGS ${QT_LIBRARIES}) - set(DRIVERS_LINK_FLAGS ${DRIVERS_LINK_FLAGS} ${qt_LINK_FLAGS}) - endif(NOT QT4_FOUND) + endif(QT4_FOUND) 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) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sm...@us...> - 2009-03-13 12:07:16
|
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. |
From: <ai...@us...> - 2009-03-15 00:07:20
|
Revision: 9738 http://plplot.svn.sourceforge.net/plplot/?rev=9738&view=rev Author: airwin Date: 2009-03-15 00:07:01 +0000 (Sun, 15 Mar 2009) Log Message: ----------- Do rpath handling for qt devices. Modified Paths: -------------- trunk/cmake/modules/qt.cmake Modified: trunk/cmake/modules/qt.cmake =================================================================== --- trunk/cmake/modules/qt.cmake 2009-03-14 23:37:34 UTC (rev 9737) +++ trunk/cmake/modules/qt.cmake 2009-03-15 00:07:01 UTC (rev 9738) @@ -33,16 +33,17 @@ # device. # qt_LINK_FLAGS - list of full path names of libraries and # linker flags for dynamic wxwidgets device driver. +# qt_RPATH - RPATH directory list for qt device driver. # DRIVERS_LINK_FLAGS - list of device LINK_FLAGS for case # when ENABLE_DYNDRIVERS OFF. 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(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}) + 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}") @@ -50,6 +51,8 @@ set(qt_LINK_FLAGS ${QT_LIBRARIES}) #message("qt_LINK_FLAGS = ${qt_LINK_FLAGS}") + set(qt_RPATH ${QT_LIBRARY_DIR}) + #message("qt_LIBRARY_DIR = ${qt_LIBRARY_DIR}") set(DRIVERS_LINK_FLAGS ${DRIVERS_LINK_FLAGS} ${qt_LINK_FLAGS}) else(QT4_FOUND) set(PLD_bmpqt OFF CACHE BOOL "Enable Qt Windows bmp device" FORCE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-04-18 00:53:24
|
Revision: 9816 http://plplot.svn.sourceforge.net/plplot/?rev=9816&view=rev Author: airwin Date: 2009-04-18 00:53:22 +0000 (Sat, 18 Apr 2009) Log Message: ----------- Define qt_gui_true to be used in the installed examples/c++ Makefile. Modified Paths: -------------- trunk/cmake/modules/qt.cmake Modified: trunk/cmake/modules/qt.cmake =================================================================== --- trunk/cmake/modules/qt.cmake 2009-04-18 00:52:12 UTC (rev 9815) +++ trunk/cmake/modules/qt.cmake 2009-04-18 00:53:22 UTC (rev 9816) @@ -68,3 +68,9 @@ set(PLD_extqt OFF CACHE BOOL "Enable Qt ext device" FORCE) endif(QT4_FOUND) 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) + +if(PLD_extqt) + set(qt_gui_true "") +else(PLD_extqt) + set(qt_gui_true "#") +endif(PLD_extqt) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-05-03 11:18:36
|
Revision: 9890 http://plplot.svn.sourceforge.net/plplot/?rev=9890&view=rev Author: airwin Date: 2009-05-03 11:18:22 +0000 (Sun, 03 May 2009) Log Message: ----------- Cannot build examples/c++/qt_example because of undefined symbols for -DENABLE_DYNDRIVERS=OFF case. Until this is sorted out post-release, disable all Qt devices for the -DENABLE_DYNDRIVERS=OFF case. Modified Paths: -------------- trunk/cmake/modules/qt.cmake Modified: trunk/cmake/modules/qt.cmake =================================================================== --- trunk/cmake/modules/qt.cmake 2009-05-03 11:14:52 UTC (rev 9889) +++ trunk/cmake/modules/qt.cmake 2009-05-03 11:18:22 UTC (rev 9890) @@ -40,7 +40,7 @@ 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 OR PLD_extqt) - if(QT4_FOUND) + if(ENABLE_DYNDRIVERS AND 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) @@ -55,7 +55,7 @@ set(qt_RPATH ${QT_LIBRARY_DIR}) #message("qt_LIBRARY_DIR = ${qt_LIBRARY_DIR}") set(DRIVERS_LINK_FLAGS ${DRIVERS_LINK_FLAGS} ${qt_LINK_FLAGS}) - else(QT4_FOUND) + else(ENABLE_DYNDRIVERS AND QT4_FOUND) 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) @@ -66,7 +66,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) + endif(ENABLE_DYNDRIVERS AND QT4_FOUND) 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) if(PLD_extqt) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hba...@us...> - 2010-09-25 23:26:03
|
Revision: 11213 http://plplot.svn.sourceforge.net/plplot/?rev=11213&view=rev Author: hbabcock Date: 2010-09-25 23:25:56 +0000 (Sat, 25 Sep 2010) Log Message: ----------- Add cmake logic to turn of the memqt device if Qt is not installed, untested. Modified Paths: -------------- trunk/cmake/modules/qt.cmake Modified: trunk/cmake/modules/qt.cmake =================================================================== --- trunk/cmake/modules/qt.cmake 2010-09-25 21:11:06 UTC (rev 11212) +++ trunk/cmake/modules/qt.cmake 2010-09-25 23:25:56 UTC (rev 11213) @@ -31,6 +31,7 @@ # PLD_qtwidget - ON means the qtwidget device is enabled. # PLD_svgqt - ON means the svgqt device is enabled. # PLD_extqt - ON means the extqt device is enabled. +# PLD_memqt - ON means the memqt device is enabled. # qt_COMPILE_FLAGS - individual COMPILE_FLAGS required to compile wxwidgets # device. # qt_LINK_FLAGS - list of full path names of libraries and @@ -50,7 +51,7 @@ # PYQT_SIP_DIR - sip system directory # PYQT_SIP_FLAGS - sip command flags -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) +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) @@ -101,6 +102,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) + set(PLD_memqt OFF CACHE BOOL "Enable Qt ext device" FORCE) endif(NOT ANY_QT_DEVICE) if(DEFAULT_NO_BINDINGS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2013-10-11 05:14:49
|
Revision: 12586 http://sourceforge.net/p/plplot/code/12586 Author: airwin Date: 2013-10-11 05:14:45 +0000 (Fri, 11 Oct 2013) Log Message: ----------- Fix a typo (missing blank delimiter after the fourth quote) in the string(REGEX REPLACE " " ";" PYQT_SIP_FLAGS "${PYQT_SIP_FLAGS}") command. This issue was discovered by CMake-2.8.12. This should have produced a wrong number of arguments error in the past for this command but somehow did not so I think previous CMake versions did not demand a blank after string to delimit the next argument so all was well. Anyhow, this issue did not appear to cause problems in the past for our pyqt4 results, but nevertheless it is good to fix this issue. Tested by Alan W. Irwin <ai...@us...> using the test_pyqt4_example target. Modified Paths: -------------- trunk/cmake/modules/qt.cmake Modified: trunk/cmake/modules/qt.cmake =================================================================== --- trunk/cmake/modules/qt.cmake 2013-10-11 04:47:25 UTC (rev 12585) +++ trunk/cmake/modules/qt.cmake 2013-10-11 05:14:45 UTC (rev 12586) @@ -212,5 +212,5 @@ endif(PYQT_SIP_FLAGS_ERR) # Must change from blank-delimited string to CMake list so that sip # COMMAND will work properly with these flags later on. - string(REGEX REPLACE " " ";"PYQT_SIP_FLAGS "${PYQT_SIP_FLAGS}") + 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. |
From: <ai...@us...> - 2013-12-12 18:03:38
|
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. |
From: <ai...@us...> - 2013-12-12 18:49:18
|
Revision: 12855 http://sourceforge.net/p/plplot/code/12855 Author: airwin Date: 2013-12-12 18:49:15 +0000 (Thu, 12 Dec 2013) Log Message: ----------- Provide soft landing when Qt is not available and when Qt is available but not with a version number that meets our minimum requirements and/or not with the components that are required. (Thanks to Phil Rosenberg for reporting this issue.) Tested by Alan W. Irwin <ai...@us...> by locally changing the minimum version required and/or the required components to non-existent ones to make sure that cmake drops all the Qt-related devices and the qt bindings and finishes without errors in those cases. Modified Paths: -------------- trunk/cmake/modules/qt.cmake Modified: trunk/cmake/modules/qt.cmake =================================================================== --- trunk/cmake/modules/qt.cmake 2013-12-12 18:03:36 UTC (rev 12854) +++ trunk/cmake/modules/qt.cmake 2013-12-12 18:49:15 UTC (rev 12855) @@ -90,34 +90,12 @@ 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) +if(ENABLE_qt) # Use a minimum version corresponding to the version installed by - # Debian Wheezy. I assume all other non-enterprise Linux distros - # have this version of Qt4 or later. - find_package(Qt4 4.8.2 REQUIRED QtCore QtGui QtSvg) + # Debian Wheezy. I assume all other non-enterprise Linux distros, + # Mac OS X, and Windows platforms also give access to this version + # of Qt4 or later. + find_package(Qt4 4.8.2 COMPONENTS QtCore QtGui QtSvg) # QT4_FOUND is defined to be true or false by find_package(Qt4 ...) if(QT4_FOUND) @@ -154,13 +132,35 @@ filter_rpath(qt_RPATH) #message("qt_LIBRARY_DIR = ${qt_LIBRARY_DIR}") else(QT4_FOUND) - message(STATUS "WARNING: Qt4 development environment not found so " - "disabling all qt devices." + message(STATUS "WARNING: Suitable Qt4 development environment not found so disabling Qt bindings." ) - set(ANY_QT_DEVICE OFF) + set(ENABLE_qt OFF CACHE BOOL "Enable Qt bindings" FORCE) endif(QT4_FOUND) -endif(ANY_QT_DEVICE) +endif(ENABLE_qt) +# 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. |
From: <ai...@us...> - 2009-05-05 06:33:49
|
Revision: 9914 http://plplot.svn.sourceforge.net/plplot/?rev=9914&view=rev Author: airwin Date: 2009-05-05 06:33:40 +0000 (Tue, 05 May 2009) Log Message: ----------- Since the build system visibility issues have been fixed for qt and -DENABLE_DYNDRIVERS=OFF, allow qt for this case (and also indirectly the -DBUILD_SHARED_LIBS=OFF case which sets ENABLE_DYNDRIVERS to OFF internally). Modified Paths: -------------- trunk/cmake/modules/qt.cmake Modified: trunk/cmake/modules/qt.cmake =================================================================== --- trunk/cmake/modules/qt.cmake 2009-05-05 06:31:25 UTC (rev 9913) +++ trunk/cmake/modules/qt.cmake 2009-05-05 06:33:40 UTC (rev 9914) @@ -40,7 +40,7 @@ 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 OR PLD_extqt) - if(ENABLE_DYNDRIVERS AND QT4_FOUND) + 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) @@ -55,7 +55,7 @@ set(qt_RPATH ${QT_LIBRARY_DIR}) #message("qt_LIBRARY_DIR = ${qt_LIBRARY_DIR}") set(DRIVERS_LINK_FLAGS ${DRIVERS_LINK_FLAGS} ${qt_LINK_FLAGS}) - else(ENABLE_DYNDRIVERS AND QT4_FOUND) + else(QT4_FOUND) 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) @@ -66,7 +66,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(ENABLE_DYNDRIVERS AND QT4_FOUND) + endif(QT4_FOUND) 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) if(PLD_extqt) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-05-08 20:47:23
|
Revision: 9945 http://plplot.svn.sourceforge.net/plplot/?rev=9945&view=rev Author: airwin Date: 2009-05-08 20:47:07 +0000 (Fri, 08 May 2009) Log Message: ----------- Only use the appropriate component of QT_LIBRARIES depending on the embedded keywords. Modified Paths: -------------- trunk/cmake/modules/qt.cmake Modified: trunk/cmake/modules/qt.cmake =================================================================== --- trunk/cmake/modules/qt.cmake 2009-05-08 20:30:19 UTC (rev 9944) +++ trunk/cmake/modules/qt.cmake 2009-05-08 20:47:07 UTC (rev 9945) @@ -50,6 +50,33 @@ set(qt_COMPILE_FLAGS "${qt_COMPILE_FLAGS} -I${DIR}") endforeach(DIR ${QT_INCLUDES}) + split_libraries_list(QT_LIBRARIES QT_LIBRARIES_general QT_LIBRARIES_debug QT_LIBRARIES_optimized) + + # There is a complicated interpretation issue to be considered here. + # FindQt4.cmake associates "debug" with the Qt4 library DEBUG suffix (with + # currently unknown criteria for which libraries are labelled that way), + # and "optimized" with the Qt4 library RELEASE suffix (again with + # currently unknown criteria). Furthermore, CMake documentation is + # is not completely clear on how the debug and optimized keywords are to + # be interpreted by target_link_libraries for the Debug, Release, + # RelWithDebInfo and MinSizeRes possibilities for CMAKE_BUILD_TYPE. For + # example with gcc, the C options are Debug=-g, Release=-O3, + # RelWithDebInfo = -g -O2, and MinSizeRes=-Os. For that compiler, some of + # the options are clearly debug (Debug), some of the options are clearly + # optimized (Release), but the rest are ambiguous. This decision may + # be changed in the future, but for now choose the debug or optimized + # Qt4 libraries only for the cases which are clearly justified, and + # otherwise just use the general Qt4 libraries. + message(STATUS "QT_LIBRARIES (mixed for all CMAKE_BUILD_TYPES) = ${QT_LIBRARIES}") + if(CMAKE_BUILD_TYPE STREQUAL "Debug") + set(QT_LIBRARIES ${QT_LIBRARIES_debug}) + elseif(CMAKE_BUILD_TYPE STREQUAL "Release") + set(QT_LIBRARIES ${QT_LIBRARIES_optimized}) + else(CMAKE_BUILD_TYPE STREQUAL "Debug") + set(QT_LIBRARIES ${QT_LIBRARIES_general}) + endif(CMAKE_BUILD_TYPE STREQUAL "Debug") + message(STATUS "specific QT_LIBRARIES results used for this CMAKE_BUILD_TYPE = ${QT_LIBRARIES}") + set(qt_LINK_FLAGS ${QT_LIBRARIES}) #message("qt_LINK_FLAGS = ${qt_LINK_FLAGS}") set(qt_RPATH ${QT_LIBRARY_DIR}) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-05-09 19:32:54
|
Revision: 9948 http://plplot.svn.sourceforge.net/plplot/?rev=9948&view=rev Author: airwin Date: 2009-05-09 19:32:47 +0000 (Sat, 09 May 2009) Log Message: ----------- Change to safer logic. Check that QT_LIBRARIES is non-empty (which assures that at least one of QT_LIBRARIES_optimized, QT_LIBRARIES_debug, or QT_LIBRARIES_general is non-empty). If CMAKE_BUILD_TYPE is Release and QT_LIBRARIES_optimized is non-empty use that for QT_LIBRARIES. Otherwise, use QT_LIBRARIES_debug if that is non-empty or QT_LIBRARIES_general if that is non-empty. Modified Paths: -------------- trunk/cmake/modules/qt.cmake Modified: trunk/cmake/modules/qt.cmake =================================================================== --- trunk/cmake/modules/qt.cmake 2009-05-09 10:12:10 UTC (rev 9947) +++ trunk/cmake/modules/qt.cmake 2009-05-09 19:32:47 UTC (rev 9948) @@ -45,6 +45,8 @@ set(QT_USE_QTSVG 1) endif(PLD_svgqt AND ${QT_VERSION_MINOR} GREATER 2) include(${QT_USE_FILE}) + endif(QT4_FOUND) + if(QT4_FOUND AND QT_LIBRARIES) set(qt_COMPILE_FLAGS) foreach(DIR ${QT_INCLUDES}) set(qt_COMPILE_FLAGS "${qt_COMPILE_FLAGS} -I${DIR}") @@ -63,26 +65,34 @@ # example with gcc, the C options are Debug=-g, Release=-O3, # RelWithDebInfo = -g -O2, and MinSizeRes=-Os. For that compiler, some of # the options are clearly debug (Debug), some of the options are clearly - # optimized (Release), but the rest are ambiguous. This decision may - # be changed in the future, but for now choose the debug or optimized - # Qt4 libraries only for the cases which are clearly justified, and - # otherwise just use the general Qt4 libraries. - message(STATUS "QT_LIBRARIES (mixed for all CMAKE_BUILD_TYPES) = ${QT_LIBRARIES}") - if(CMAKE_BUILD_TYPE STREQUAL "Debug") + # optimized (Release), but the rest are ambiguous. For now we will assign + # the ambiguous ones to debug, but we may change that interpretation + # in the future. It is also clear from analysis of FindQt4.cmake that any + # of QT_LIBRARIES_general, QT_LIBRARIES_debug, or QT_LIBRARIES_optimized + # could be empty depending on the Qt install and whether CMAKE_BUILD_TYPE + # is specified or not. Therefore, specifically deal with the empty cases. + message(STATUS "QT_LIBRARIES = ${QT_LIBRARIES}") + if(CMAKE_BUILD_TYPE STREQUAL "Release" AND QT_LIBRARIES_optimized) + set(QT_LIBRARIES ${QT_LIBRARIES_optimized}) + elseif(QT_LIBRARIES_debug) set(QT_LIBRARIES ${QT_LIBRARIES_debug}) - elseif(CMAKE_BUILD_TYPE STREQUAL "Release") - set(QT_LIBRARIES ${QT_LIBRARIES_optimized}) - else(CMAKE_BUILD_TYPE STREQUAL "Debug") + elseif(QT_LIBRARIES_general) set(QT_LIBRARIES ${QT_LIBRARIES_general}) - endif(CMAKE_BUILD_TYPE STREQUAL "Debug") - message(STATUS "specific QT_LIBRARIES results used for this CMAKE_BUILD_TYPE = ${QT_LIBRARIES}") + else(CMAKE_BUILD_TYPE STREQUAL "Release" AND QT_LIBRARIES_optimized) + # This should be impossible because of the above check on QT_LIBRARIES + # being true (i.e., non-empty). + message(FATAL_ERROR "qt.cmake QT_LIBRARIES logic error") + endif(CMAKE_BUILD_TYPE STREQUAL "Release" AND QT_LIBRARIES_optimized) + message(STATUS "revised QT_LIBRARIES (based on keyword interpretation for +the CMAKE_BUILD_TYPE that is specified) = ${QT_LIBRARIES}") set(qt_LINK_FLAGS ${QT_LIBRARIES}) #message("qt_LINK_FLAGS = ${qt_LINK_FLAGS}") set(qt_RPATH ${QT_LIBRARY_DIR}) #message("qt_LIBRARY_DIR = ${qt_LIBRARY_DIR}") set(DRIVERS_LINK_FLAGS ${DRIVERS_LINK_FLAGS} ${qt_LINK_FLAGS}) - else(QT4_FOUND) + else(QT4_FOUND AND QT_LIBRARIES) + message(STATUS "QT_LIBRARIES not found 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) @@ -93,7 +103,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) + endif(QT4_FOUND AND QT_LIBRARIES) 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) if(PLD_extqt) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-06-23 01:19:06
|
Revision: 10064 http://plplot.svn.sourceforge.net/plplot/?rev=10064&view=rev Author: airwin Date: 2009-06-23 00:48:12 +0000 (Tue, 23 Jun 2009) Log Message: ----------- Configure some sip-related variables so that can use sip directly (rather than indirectly via python) to generate source code for plplot_pyqt4 extension module. Modified Paths: -------------- trunk/cmake/modules/qt.cmake Modified: trunk/cmake/modules/qt.cmake =================================================================== --- trunk/cmake/modules/qt.cmake 2009-06-23 00:46:38 UTC (rev 10063) +++ trunk/cmake/modules/qt.cmake 2009-06-23 00:48:12 UTC (rev 10064) @@ -41,6 +41,9 @@ # ENABLE_qt - ON means the plplot_qt library is enabled. # ENABLE_pyqt4 - ON means the plplot_pyqt4 Python extension module # is enabled. +# SIP_EXECUTABLE - full path for sip +# PYQT_SIP_DIR - sip system directory +# PYQT_SIP_FLAGS - sip command flags 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 OR PLD_extqt) @@ -88,17 +91,17 @@ if(ENABLE_qt AND NOT PLD_extqt) message(STATUS - "WARNING: PLD_extqt is OFF so " - "setting ENABLE_qt to OFF." - ) + "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) if(ENABLE_pyqt4 AND NOT ENABLE_python AND NOT ENABLE_qt) message(STATUS - "WARNING: ENABLE_python OR ENABLE_qt is OFF so " - "setting ENABLE_pyqt4 to OFF." - ) + "WARNING: ENABLE_python OR 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_python AND NOT ENABLE_qt) @@ -107,3 +110,47 @@ else(ENABLE_qt) set(qt_gui_true "#") endif(ENABLE_qt) + +if(ENABLE_pyqt4) + find_program(SIP_EXECUTABLE sip) + if(NOT SIP_EXECUTABLE) + message(STATUS + "WARNING: sip not found so setting ENABLE_pyqt4 to OFF." + ) + set(ENABLE_pyqt4 OFF CACHE BOOL "Enable pyqt4 Python extension module " FORCE) + endif(NOT SIP_EXECUTABLE) +endif(ENABLE_pyqt4) + +if(ENABLE_pyqt4) + execute_process( + COMMAND ${PYTHON_EXECUTABLE} -c "from PyQt4 import pyqtconfig; print pyqtconfig.Configuration().pyqt_sip_dir" + OUTPUT_VARIABLE PYQT_SIP_DIR + RESULT_VARIABLE PYQT_SIP_DIR_ERR + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + if(PYQT_SIP_DIR_ERR) + message(STATUS + "WARNING: could not find sip directory so setting ENABLE_pyqt4 to OFF." + ) + set(ENABLE_pyqt4 OFF CACHE BOOL "Enable pyqt4 Python extension module " FORCE) + endif(PYQT_SIP_DIR_ERR) +endif(ENABLE_pyqt4) + +if(ENABLE_pyqt4) + execute_process( + COMMAND ${PYTHON_EXECUTABLE} -c "from PyQt4 import pyqtconfig; print pyqtconfig.Configuration().pyqt_sip_flags" + OUTPUT_VARIABLE PYQT_SIP_FLAGS + RESULT_VARIABLE PYQT_SIP_FLAGS_ERR + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + if(PYQT_SIP_FLAGS_ERR) + message(STATUS + "WARNING: could not find sip flags so setting ENABLE_pyqt4 to OFF." + ) + set(ENABLE_pyqt4 OFF CACHE BOOL "Enable pyqt4 Python extension module " FORCE) + endif(PYQT_SIP_DIR_ERR) + # Must change from blank-delimited string to CMake list so that sip + # 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. |
From: <ai...@us...> - 2009-06-28 06:13:09
|
Revision: 10083 http://plplot.svn.sourceforge.net/plplot/?rev=10083&view=rev Author: airwin Date: 2009-06-28 06:13:08 +0000 (Sun, 28 Jun 2009) Log Message: ----------- Supress nonconsequential CMake warning message by making endif tag match the corresponding if tag. Modified Paths: -------------- trunk/cmake/modules/qt.cmake Modified: trunk/cmake/modules/qt.cmake =================================================================== --- trunk/cmake/modules/qt.cmake 2009-06-28 02:47:15 UTC (rev 10082) +++ trunk/cmake/modules/qt.cmake 2009-06-28 06:13:08 UTC (rev 10083) @@ -174,7 +174,7 @@ "WARNING: could not find sip flags so setting ENABLE_pyqt4 to OFF." ) set(ENABLE_pyqt4 OFF CACHE BOOL "Enable pyqt4 Python extension module " FORCE) - endif(PYQT_SIP_DIR_ERR) + endif(PYQT_SIP_FLAGS_ERR) # Must change from blank-delimited string to CMake list so that sip # COMMAND will work properly with these flags later on. string(REGEX REPLACE " " ";"PYQT_SIP_FLAGS "${PYQT_SIP_FLAGS}") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-06-28 08:27:13
|
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. |
From: <ai...@us...> - 2009-06-28 15:22:21
|
Revision: 10091 http://plplot.svn.sourceforge.net/plplot/?rev=10091&view=rev Author: airwin Date: 2009-06-28 15:21:29 +0000 (Sun, 28 Jun 2009) Log Message: ----------- Only attempt to find Qt4 if there is at least one qt device enabled. Modified Paths: -------------- trunk/cmake/modules/qt.cmake Modified: trunk/cmake/modules/qt.cmake =================================================================== --- trunk/cmake/modules/qt.cmake 2009-06-28 08:53:18 UTC (rev 10090) +++ trunk/cmake/modules/qt.cmake 2009-06-28 15:21:29 UTC (rev 10091) @@ -50,12 +50,12 @@ # PYQT_SIP_DIR - sip system directory # PYQT_SIP_FLAGS - sip command flags -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 OR PLD_extqt) 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) if(ANY_QT_DEVICE) + find_package(Qt4) if(QT4_FOUND) if(PLD_svgqt AND ${QT_VERSION_MINOR} GREATER 2) set(QT_USE_QTSVG 1) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-07-28 04:54:31
|
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. |
From: <ai...@us...> - 2009-08-27 00:50:27
|
Revision: 10349 http://plplot.svn.sourceforge.net/plplot/?rev=10349&view=rev Author: airwin Date: 2009-08-27 00:26:35 +0000 (Thu, 27 Aug 2009) Log Message: ----------- Deal properly with the case where the Qt4 development environment is not found. Modified Paths: -------------- trunk/cmake/modules/qt.cmake Modified: trunk/cmake/modules/qt.cmake =================================================================== --- trunk/cmake/modules/qt.cmake 2009-08-26 21:07:02 UTC (rev 10348) +++ trunk/cmake/modules/qt.cmake 2009-08-27 00:26:35 UTC (rev 10349) @@ -81,6 +81,11 @@ set(qt_LINK_FLAGS) set(qt_RPATH ${QT_LIBRARY_DIR}) #message("qt_LIBRARY_DIR = ${qt_LIBRARY_DIR}") + else(QT4_FOUND) + message(STATUS "WARNING: Qt4 development environment not found so " + "disabling all qt devices." + ) + set(ANY_QT_DEVICE OFF) endif(QT4_FOUND) endif(ANY_QT_DEVICE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hba...@us...> - 2010-09-25 23:27:31
|
Revision: 11214 http://plplot.svn.sourceforge.net/plplot/?rev=11214&view=rev Author: hbabcock Date: 2010-09-25 23:27:25 +0000 (Sat, 25 Sep 2010) Log Message: ----------- Fix if statement for memqt device. Modified Paths: -------------- trunk/cmake/modules/qt.cmake Modified: trunk/cmake/modules/qt.cmake =================================================================== --- trunk/cmake/modules/qt.cmake 2010-09-25 23:25:56 UTC (rev 11213) +++ trunk/cmake/modules/qt.cmake 2010-09-25 23:27:25 UTC (rev 11214) @@ -53,7 +53,7 @@ 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) +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) if(ANY_QT_DEVICE) if(NOT CMAKE_CXX_COMPILER_WORKS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hba...@us...> - 2010-09-25 23:28:13
|
Revision: 11215 http://plplot.svn.sourceforge.net/plplot/?rev=11215&view=rev Author: hbabcock Date: 2010-09-25 23:28:07 +0000 (Sat, 25 Sep 2010) Log Message: ----------- Fix typo for memqt device. Modified Paths: -------------- trunk/cmake/modules/qt.cmake Modified: trunk/cmake/modules/qt.cmake =================================================================== --- trunk/cmake/modules/qt.cmake 2010-09-25 23:27:25 UTC (rev 11214) +++ trunk/cmake/modules/qt.cmake 2010-09-25 23:28:07 UTC (rev 11215) @@ -102,7 +102,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) - set(PLD_memqt 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(DEFAULT_NO_BINDINGS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
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. |
From: <ai...@us...> - 2013-10-26 01:00:50
|
Revision: 12630 http://sourceforge.net/p/plplot/code/12630 Author: airwin Date: 2013-10-26 01:00:43 +0000 (Sat, 26 Oct 2013) Log Message: ----------- Drop qt devices if ENABLE_qt (which activates the build of the plplotqtd library which the qt devices depend on) is false. Modified Paths: -------------- trunk/cmake/modules/qt.cmake Modified: trunk/cmake/modules/qt.cmake =================================================================== --- trunk/cmake/modules/qt.cmake 2013-10-25 18:51:21 UTC (rev 12629) +++ trunk/cmake/modules/qt.cmake 2013-10-26 01:00:43 UTC (rev 12630) @@ -102,20 +102,6 @@ endif(QT4_FOUND) 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) - 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(DEFAULT_NO_BINDINGS) option(ENABLE_qt "Enable Qt bindings" OFF) option(ENABLE_pyqt4 "Enable pyqt4 Python extension module" OFF) @@ -124,6 +110,11 @@ 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 " @@ -132,6 +123,29 @@ 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(ENABLE_qt AND NOT PLD_extqt) + +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. |
From: <ai...@us...> - 2013-10-26 06:41:11
|
Revision: 12632 http://sourceforge.net/p/plplot/code/12632 Author: airwin Date: 2013-10-26 06:41:06 +0000 (Sat, 26 Oct 2013) Log Message: ----------- Fix endif label inconsistency that crept into last commit. Modified Paths: -------------- trunk/cmake/modules/qt.cmake Modified: trunk/cmake/modules/qt.cmake =================================================================== --- trunk/cmake/modules/qt.cmake 2013-10-26 02:45:20 UTC (rev 12631) +++ trunk/cmake/modules/qt.cmake 2013-10-26 06:41:06 UTC (rev 12632) @@ -130,7 +130,7 @@ "setting all qt devices to OFF." ) set(ANY_QT_DEVICE OFF) -endif(ENABLE_qt AND NOT PLD_extqt) +endif(NOT ENABLE_qt) if(NOT ANY_QT_DEVICE) set(PLD_bmpqt OFF CACHE BOOL "Enable Qt Windows bmp device" FORCE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2014-03-14 04:38:22
|
Revision: 13055 http://sourceforge.net/p/plplot/code/13055 Author: airwin Date: 2014-03-14 04:38:18 +0000 (Fri, 14 Mar 2014) Log Message: ----------- For the Qt5 case set PLD_epsqt to OFF since Qt5 does not support PostScript. This change requires rearrangment of the logic so that the order of the variable processing changes from ANY_QT_DEVICE ==> ENABLE_qt ==> PLPLOT_USE_QT5 to ENABLE_qt ==> PLPLOT_USE_QT5 ==> ANY_QT_DEVICE. Visual inspection of the code appears to indicate there should be no issues with this new order. Modified Paths: -------------- trunk/cmake/modules/qt.cmake Modified: trunk/cmake/modules/qt.cmake =================================================================== --- trunk/cmake/modules/qt.cmake 2014-03-14 04:24:20 UTC (rev 13054) +++ trunk/cmake/modules/qt.cmake 2014-03-14 04:38:18 UTC (rev 13055) @@ -56,6 +56,31 @@ # PYQT_SIP_DIR - sip system directory # PYQT_SIP_FLAGS - sip command flags +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) + +if(ENABLE_qt) + option(PLPLOT_USE_QT5 "Experimental (and currently quite limited) option to try Qt5" OFF) + + if(PLPLOT_USE_QT5) + find_package(Qt5Core 5.2.1) + if(Qt5Core_FOUND) + message(STATUS "Attempting to use Qt5 so have set PLD_epsqt to OFF since Qt5 does not support PostScript") + set(PLD_epsqt OFF CACHE BOOL "Enable Qt EPS device" FORCE) + else(Qt5Core_FOUND) + message(STATUS + "WARNING: Qt5Core could not be found so falling back to Qt4" + ) + set(PLPLOT_USE_QT5 OFF CACHE BOOL "Experimental (and currently quite limited) option to try Qt5" FORCE) + endif(Qt5Core_FOUND) + endif(PLPLOT_USE_QT5) +endif(ENABLE_qt) + 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) @@ -69,14 +94,6 @@ 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) @@ -91,18 +108,6 @@ endif(ENABLE_qt AND NOT PLD_extqt) if(ENABLE_qt) - option(PLPLOT_USE_QT5 "Experimental (and currently quite limited) option to try Qt5" OFF) - - if(PLPLOT_USE_QT5) - find_package(Qt5Core 5.2.1) - if(NOT Qt5Core_FOUND) - message(STATUS - "WARNING: Qt5Core could not be found so falling back to Qt4" - ) - set(PLPLOT_USE_QT5 OFF CACHE BOOL "Experimental (and currently quite limited) option to try Qt5" FORCE) - endif(NOT Qt5Core_FOUND) - endif(PLPLOT_USE_QT5) - if(NOT PLPLOT_USE_QT5) # Use a minimum version corresponding to the version installed by # Debian Wheezy. I assume all other non-enterprise Linux distros, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |