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. |