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

[<ai...@us...>]

Revision: 13052
          http://sourceforge.net/p/plplot/code/13052
Author:   airwin
Date:     2014-03-13 19:26:25 +0000 (Thu, 13 Mar 2014)
Log Message:
-----------
Fix typographical error in how Qt5 components are specified.
(This change only affects the experimental -DPLPLOT_USE_QT5=ON case.)

Modified Paths:
--------------
    trunk/bindings/qt_gui/CMakeLists.txt
    trunk/drivers/CMakeLists.txt
    trunk/src/CMakeLists.txt

Modified: trunk/bindings/qt_gui/CMakeLists.txt
===================================================================
--- trunk/bindings/qt_gui/CMakeLists.txt	2014-03-12 23:39:20 UTC (rev 13051)
+++ trunk/bindings/qt_gui/CMakeLists.txt	2014-03-13 19:26:25 UTC (rev 13052)
@@ -42,10 +42,10 @@
   endif(ANY_QT_DEVICE)
 
   if(PLPLOT_USE_QT5)
-    # According to advice from Steve Kelly on the Cmake list, QtGui
-    # is a dependency of QtSvg so is not needed here, but I will
-    # leave it in since it is informative.
-    qt5_use_modules(plplotqt${LIB_TAG} QtSvg QtGui)
+    # According to advice from Steve Kelly on the Cmake list, the Qt5
+    # Gui component is a dependency of the Qt5 Svg component so is not
+    # needed here, but I will leave it in since it is informative.
+    qt5_use_modules(plplotqt${LIB_TAG} Svg Gui)
 
     target_link_libraries(
       plplotqt${LIB_TAG}

Modified: trunk/drivers/CMakeLists.txt
===================================================================
--- trunk/drivers/CMakeLists.txt	2014-03-12 23:39:20 UTC (rev 13051)
+++ trunk/drivers/CMakeLists.txt	2014-03-13 19:26:25 UTC (rev 13052)
@@ -107,10 +107,10 @@
       if(ANY_QT_DEVICE)
 	add_library(${SOURCE_ROOT_NAME} MODULE ${${SOURCE_ROOT_NAME}_SOURCE})
 	if(PLPLOT_USE_QT5)
-	  # According to advice from Steve Kelly on the Cmake list, QtGui
-	  # is a dependency of QtSvg so is not needed here, but I will
-	  # leave it in since it is informative.
-	  qt5_use_modules(${SOURCE_ROOT_NAME} QtSvg QtGui)
+	  # According to advice from Steve Kelly on the Cmake list, the Qt5
+	  # Gui component is a dependency of the Qt5 Svg component so is not
+	  # needed here, but I will leave it in since it is informative.
+	  qt5_use_modules(${SOURCE_ROOT_NAME} Svg Gui)
 	  target_link_libraries(
 	    ${SOURCE_ROOT_NAME}
 	    plplot${LIB_TAG}

Modified: trunk/src/CMakeLists.txt
===================================================================
--- trunk/src/CMakeLists.txt	2014-03-12 23:39:20 UTC (rev 13051)
+++ trunk/src/CMakeLists.txt	2014-03-13 19:26:25 UTC (rev 13052)
@@ -185,10 +185,10 @@
 add_dependencies(plplot${LIB_TAG} plhershey-unicode.h_built ${qt_dependency})
 
 if(NOT ENABLE_DYNDRIVERS AND ANY_QT_DEVICE AND PLPLOT_USE_QT5)
-  # According to advice from Steve Kelly on the Cmake list, QtGui
-  # is a dependency of QtSvg so is not needed here, but I will
-  # leave it in since it is informative.
-  qt5_use_modules(plplot${LIB_TAG} QtSvg QtGui)
+  # According to advice from Steve Kelly on the Cmake list, the Qt5
+  # Gui component is a dependency of the Qt5 Svg component so is not
+  # needed here, but I will leave it in since it is informative.
+  qt5_use_modules(plplot${LIB_TAG} Svg Gui)
 endif(NOT ENABLE_DYNDRIVERS AND ANY_QT_DEVICE AND PLPLOT_USE_QT5)
 
 if(NON_TRANSITIVE)

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