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

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

Revision: 9687
          http://plplot.svn.sourceforge.net/plplot/?rev=9687&view=rev
Author:   airwin
Date:     2009-03-09 19:33:22 +0000 (Mon, 09 Mar 2009)

Log Message:
-----------
Pass "-DPLD_qtwidget=ON" option to moc when the qt device is being built
with -DPLD_qtwidget=ON.  This sorts out all cmake-2.6.0 problems with
using moc so that 2.6.3 is no longer a necessity for building the qt device
driver.

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

Modified: trunk/drivers/CMakeLists.txt
===================================================================
--- trunk/drivers/CMakeLists.txt	2009-03-09 18:05:18 UTC (rev 9686)
+++ trunk/drivers/CMakeLists.txt	2009-03-09 19:33:22 UTC (rev 9687)
@@ -90,18 +90,21 @@
       PROPERTIES COMPILE_FLAGS "-DUSINGDLL"
       )
     endif(${SOURCE_ROOT_NAME}_COMPILE_FLAGS)
-    if(SOURCE_ROOT_NAME STREQUAL "qt")
-      qt4_wrap_cpp(QT_MOC_OUTFILES ${CMAKE_CURRENT_SOURCE_DIR}/qt.h)
-      # Temporary debugging message.
-      message("QT_MOC_OUTFILES = ${QT_MOC_OUTFILES}")
+    if(SOURCE_ROOT_NAME STREQUAL "qt" AND PLD_qtwidget)
+      qt4_wrap_cpp(
+        QT_MOC_OUTFILES 
+	${CMAKE_CURRENT_SOURCE_DIR}/qt.h
+	OPTIONS "-DPLD_qtwidget=ON"
+	)
+      # message("QT_MOC_OUTFILES = ${QT_MOC_OUTFILES}")
       set_source_files_properties(
       ${QT_MOC_OUTFILES}
       PROPERTIES GENERATED "ON"
       )
       add_library(${SOURCE_ROOT_NAME} MODULE ${${SOURCE_ROOT_NAME}_SOURCE} ${QT_MOC_OUTFILES})
-    else(SOURCE_ROOT_NAME STREQUAL "qt")
+    else(SOURCE_ROOT_NAME STREQUAL "qt" AND PLD_qtwidget)
         add_library(${SOURCE_ROOT_NAME} MODULE ${${SOURCE_ROOT_NAME}_SOURCE})
-    endif(SOURCE_ROOT_NAME STREQUAL "qt")
+    endif(SOURCE_ROOT_NAME STREQUAL "qt" AND PLD_qtwidget)
     # ${SOURCE_ROOT_NAME}_LINK_FLAGS is ideally a list of the full path names
     # to libraries determined with find_library.  However, the list can also
     # include link flags such as the -L and -l form of specifying libraries,


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