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

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

Revision: 9803
          http://plplot.svn.sourceforge.net/plplot/?rev=9803&view=rev
Author:   andrewross
Date:     2009-04-16 13:52:44 +0000 (Thu, 16 Apr 2009)

Log Message:
-----------
Fix up cmake support for PLD_extqt so moc is called with the right options.

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

Modified: trunk/cmake/modules/qt.cmake
===================================================================
--- trunk/cmake/modules/qt.cmake	2009-04-15 20:29:27 UTC (rev 9802)
+++ trunk/cmake/modules/qt.cmake	2009-04-16 13:52:44 UTC (rev 9803)
@@ -29,6 +29,7 @@
 # PLD_pdfqt		  - ON means the pdfqt device is enabled.
 # PLD_qtwidget		  - ON means the qtwidget device is enabled.
 # PLD_svgqt		  - ON means the svgqt device is enabled.
+# PLD_extqt		  - ON means the extqt device is enabled.
 # qt_COMPILE_FLAGS	  - individual COMPILE_FLAGS required to compile wxwidgets
 # 			    device.
 # qt_LINK_FLAGS	  	  - list of full path names of libraries and
@@ -38,7 +39,7 @@
 # 			    when ENABLE_DYNDRIVERS OFF.
 
 find_package(Qt4)
-if(PLD_bmpqt OR PLD_jpgqt OR PLD_pngqt OR PLD_ppmqt OR PLD_tiffqt OR PLD_epsqt OR PLD_pdfqt OR PLD_qtwidget OR PLD_svgqt)
+if(PLD_bmpqt OR PLD_jpgqt OR PLD_pngqt OR PLD_ppmqt OR PLD_tiffqt OR PLD_epsqt OR PLD_pdfqt OR PLD_qtwidget OR PLD_svgqt OR PLD_extqt)
   if(QT4_FOUND)
     if(PLD_svgqt AND ${QT_VERSION_MINOR} GREATER 2)
       set(QT_USE_QTSVG 1)
@@ -64,5 +65,6 @@
     set(PLD_pdfqt OFF CACHE BOOL "Enable Qt PDF device" FORCE)
     set(PLD_qtwidget OFF CACHE BOOL "Enable Qt interactive device" FORCE)
     set(PLD_svgqt OFF CACHE BOOL "Enable Qt SVG device" FORCE)
+    set(PLD_extqt OFF CACHE BOOL "Enable Qt ext device" FORCE)
   endif(QT4_FOUND)
-endif(PLD_bmpqt OR PLD_jpgqt OR PLD_pngqt OR PLD_ppmqt OR PLD_tiffqt OR PLD_epsqt OR PLD_pdfqt OR PLD_qtwidget OR PLD_svgqt)
+endif(PLD_bmpqt OR PLD_jpgqt OR PLD_pngqt OR PLD_ppmqt OR PLD_tiffqt OR PLD_epsqt OR PLD_pdfqt OR PLD_qtwidget OR PLD_svgqt OR PLD_extqt)

Modified: trunk/drivers/CMakeLists.txt
===================================================================
--- trunk/drivers/CMakeLists.txt	2009-04-15 20:29:27 UTC (rev 9802)
+++ trunk/drivers/CMakeLists.txt	2009-04-16 13:52:44 UTC (rev 9803)
@@ -90,11 +90,12 @@
 	PROPERTIES COMPILE_FLAGS "-DUSINGDLL"
 	)
     endif(${SOURCE_ROOT_NAME}_COMPILE_FLAGS)
-    if(SOURCE_ROOT_NAME STREQUAL "qt" AND PLD_qtwidget)
+    if(SOURCE_ROOT_NAME STREQUAL "qt")
+      if(PLD_qtwidget OR PLD_extqt)
       qt4_wrap_cpp(
         QT_MOC_OUTFILES 
 	${CMAKE_CURRENT_SOURCE_DIR}/qt.h
-	OPTIONS "-DPLD_qtwidget=ON"
+	OPTIONS "-DPLD_qtwidget=${PLD_qtwidget} -DPLD_extqt=${PLD_extqt}"
 	)
       # message("QT_MOC_OUTFILES = ${QT_MOC_OUTFILES}")
       set_source_files_properties(
@@ -102,9 +103,12 @@
 	PROPERTIES GENERATED "ON"
 	)
       add_library(${SOURCE_ROOT_NAME} MODULE ${${SOURCE_ROOT_NAME}_SOURCE} ${QT_MOC_OUTFILES})
-    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" AND PLD_qtwidget)
+      else(PLD_qtwidget OR PLD_extqt)
+        add_library(${SOURCE_ROOT_NAME} MODULE ${${SOURCE_ROOT_NAME}_SOURCE})
+      endif(PLD_qtwidget OR PLD_extqt)
+    else(SOURCE_ROOT_NAME STREQUAL "qt")
+        add_library(${SOURCE_ROOT_NAME} MODULE ${${SOURCE_ROOT_NAME}_SOURCE})
+    endif(SOURCE_ROOT_NAME STREQUAL "qt")
     # ${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,

Modified: trunk/src/CMakeLists.txt
===================================================================
--- trunk/src/CMakeLists.txt	2009-04-15 20:29:27 UTC (rev 9802)
+++ trunk/src/CMakeLists.txt	2009-04-16 13:52:44 UTC (rev 9803)
@@ -100,19 +100,22 @@
   foreach(SOURCE_ROOT_NAME ${DRIVERS_LIST})
     #message("${SOURCE_ROOT_NAME}_SOURCE = ${${SOURCE_ROOT_NAME}_SOURCE}")
     list(APPEND plplot${LIB_TAG}_LIB_SRCS ${${SOURCE_ROOT_NAME}_SOURCE})
-    if(SOURCE_ROOT_NAME STREQUAL "qt" AND PLD_qtwidget)
+   if(SOURCE_ROOT_NAME STREQUAL "qt")
+      if(PLD_qtwidget OR PLD_extqt)
       qt4_wrap_cpp(
-        QT_MOC_OUTFILES 
-	${CMAKE_SOURCE_DIR}/drivers/qt.h
-	OPTIONS "-DPLD_qtwidget=ON"
-	)
+        QT_MOC_OUTFILES
+        ${CMAKE_CURRENT_SOURCE_DIR}/qt.h
+        OPTIONS "-DPLD_qtwidget=${PLD_qtwidget} -DPLD_extqt=${PLD_extqt}"
+        )
       # message("QT_MOC_OUTFILES = ${QT_MOC_OUTFILES}")
       set_source_files_properties(
-      ${QT_MOC_OUTFILES}
-      PROPERTIES GENERATED "ON"
-      )
+        ${QT_MOC_OUTFILES}
+        PROPERTIES GENERATED "ON"
+        )
       list(APPEND plplot${LIB_TAG}_LIB_SRCS ${QT_MOC_OUTFILES})
-    endif(SOURCE_ROOT_NAME STREQUAL "qt" AND PLD_qtwidget)
+      endif(PLD_qtwidget OR PLD_extqt)
+    endif(SOURCE_ROOT_NAME STREQUAL "qt")
+
     if(${SOURCE_ROOT_NAME}_COMPILE_FLAGS)
       set_source_files_properties(
       ${${SOURCE_ROOT_NAME}_SOURCE}


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