[Plplot-cvs] SF.net SVN: plplot:[13053] trunk/src/CMakeLists.txt

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

Revision: 13053
          http://sourceforge.net/p/plplot/code/13053
Author:   airwin
Date:     2014-03-13 23:01:25 +0000 (Thu, 13 Mar 2014)
Log Message:
-----------
Only call set_qt_target_properties for the Qt4 case.  (The Qt5 case is
handled an entirely different way that never involves
set_qt_target_properties.)

Modified Paths:
--------------
    trunk/src/CMakeLists.txt

Modified: trunk/src/CMakeLists.txt
===================================================================
--- trunk/src/CMakeLists.txt	2014-03-13 19:26:25 UTC (rev 13052)
+++ trunk/src/CMakeLists.txt	2014-03-13 23:01:25 UTC (rev 13053)
@@ -213,11 +213,11 @@
 else(ENABLE_DYNDRIVERS)
   list(APPEND libplplot${LIB_TAG}_LINK_LIBRARIES ${DRIVERS_LINK_FLAGS})
   list(APPEND LIB_INSTALL_RPATH ${DRIVERS_RPATH})
-  if(ANY_QT_DEVICE)
+  if(ANY_QT_DEVICE AND NOT PLPLOT_USE_QT5)
     # Update the target COMPILE_DEFINITIONS and INCLUDE_DIRECTORIES
     set_qt_target_properties(plplot${LIB_TAG})
   endif(ANY_QT_DEVICE)
-endif(ENABLE_DYNDRIVERS)
+endif(ENABLE_DYNDRIVERS AND NOT PLPLOT_USE_QT5)
 #message("DEBUG: LIB_INSTALL_RPATH = ${LIB_INSTALL_RPATH}")
 
 if(MATH_LIB)

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