[Plplot-cvs] SF.net SVN: plplot:[13059] trunk/drivers/CMakeLists.txt

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

Revision: 13059
          http://sourceforge.net/p/plplot/code/13059
Author:   airwin
Date:     2014-03-15 01:40:59 +0000 (Sat, 15 Mar 2014)
Log Message:
-----------
Use improved placement for the block of CMake code that might in the
future create a dependency on the moc_outfile_generated target which
is now available for both the Qt4 and Qt5 cases.  Note this changed
placement currently has no practical effect and is only for didactic
reasons since this actual block of code is currently not executed
(ANY_QT_DEVICE and NOT ENABLE_qt cannot currently be simultanously
true).

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

Modified: trunk/drivers/CMakeLists.txt
===================================================================
--- trunk/drivers/CMakeLists.txt	2014-03-15 00:28:58 UTC (rev 13058)
+++ trunk/drivers/CMakeLists.txt	2014-03-15 01:40:59 UTC (rev 13059)
@@ -118,14 +118,6 @@
 	    ${${SOURCE_ROOT_NAME}_TARGETS}
 	    )
 	else(PLPLOT_USE_QT5)
-	  if(NOT ENABLE_qt)
-	    # Note this code is never executed considering the way the
-            # build system is set up now (see cmake/modules/qt.cmake),
-            # but nevertheless keep it for the future in case we ever
-            # want to deal with the case where we want to build the qt
-            # device without building the plplotqtd library
-	    add_dependencies(${SOURCE_ROOT_NAME} moc_outfile_generated)
-	  endif(NOT ENABLE_qt)
 	  if(NOT QT_LIBRARIES)
 	    message(FATAL_ERROR "Internal build system inconsistency. QT_LIBRARIESis empty but it should be populated")
 	  endif(NOT QT_LIBRARIES)
@@ -140,6 +132,14 @@
 	  # Update the target COMPILE_DEFINITIONS and INCLUDE_DIRECTORIES
 	  set_qt_target_properties(${SOURCE_ROOT_NAME})
 	endif(PLPLOT_USE_QT5)
+	if(NOT ENABLE_qt)
+	  # Note this code is never executed considering the way the
+          # build system is set up now (see cmake/modules/qt.cmake),
+          # but nevertheless keep it for the future in case we ever
+          # want to deal with the case where we want to build the qt
+          # device without building the plplotqtd library
+	  add_dependencies(${SOURCE_ROOT_NAME} moc_outfile_generated)
+	endif(NOT ENABLE_qt)
       else(ANY_QT_DEVICE)
 	message(FATAL_ERROR "Internal build system inconsistency.  Attempt to build dynamic qt device when ANY_QT_DEVICE is false.")
       endif(ANY_QT_DEVICE)

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