[Plplot-cvs] SF.net SVN: plplot:[12221] trunk

[<and...@us...>]

Revision: 12221
          http://plplot.svn.sourceforge.net/plplot/?rev=12221&view=rev
Author:   andrewross
Date:     2012-08-21 11:45:29 +0000 (Tue, 21 Aug 2012)
Log Message:
-----------
Tweak qt driver to include QT_LIBRARIES in qt_LINK_FLAGS as is done for all other drivers.

Modified Paths:
--------------
    trunk/cmake/modules/qt.cmake
    trunk/drivers/CMakeLists.txt

Modified: trunk/cmake/modules/qt.cmake
===================================================================
--- trunk/cmake/modules/qt.cmake	2012-08-21 11:44:32 UTC (rev 12220)
+++ trunk/cmake/modules/qt.cmake	2012-08-21 11:45:29 UTC (rev 12221)
@@ -90,7 +90,7 @@
       set(qt_COMPILE_FLAGS "${qt_COMPILE_FLAGS} -I${DIR}")
     endforeach(DIR ${QT_INCLUDES})
     
-    set(qt_LINK_FLAGS)
+    set(qt_LINK_FLAGS ${QT_LIBRARIES})
     set(qt_RPATH ${QT_LIBRARY_DIR})
     filter_rpath(qt_RPATH)
     #message("qt_LIBRARY_DIR = ${qt_LIBRARY_DIR}")

Modified: trunk/drivers/CMakeLists.txt
===================================================================
--- trunk/drivers/CMakeLists.txt	2012-08-21 11:44:32 UTC (rev 12220)
+++ trunk/drivers/CMakeLists.txt	2012-08-21 11:45:29 UTC (rev 12221)
@@ -119,7 +119,6 @@
 	  ${MATH_LIB}
 	  ${${SOURCE_ROOT_NAME}_LINK_FLAGS}
 	  ${${SOURCE_ROOT_NAME}_TARGETS}
-	  ${QT_LIBRARIES}
 	  )
       else(ANY_QT_DEVICE)
 	message(FATAL_ERROR "Internal build system inconsistency.  Attempt to build dynamic qt device when ANY_QT_DEVICE is false.")

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