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

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

Revision: 9700
          http://plplot.svn.sourceforge.net/plplot/?rev=9700&view=rev
Author:   airwin
Date:     2009-03-10 17:30:10 +0000 (Tue, 10 Mar 2009)

Log Message:
-----------
Allow -dev qtwidgets to build properly for the -DENABLE_DYNDRIVERS=OFF case.

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

Modified: trunk/src/CMakeLists.txt
===================================================================
--- trunk/src/CMakeLists.txt	2009-03-10 16:59:15 UTC (rev 9699)
+++ trunk/src/CMakeLists.txt	2009-03-10 17:30:10 UTC (rev 9700)
@@ -99,10 +99,20 @@
   set(DRIVERS_RPATH)
   foreach(SOURCE_ROOT_NAME ${DRIVERS_LIST})
     #message("${SOURCE_ROOT_NAME}_SOURCE = ${${SOURCE_ROOT_NAME}_SOURCE}")
-    set(plplot${LIB_TAG}_LIB_SRCS 
-    ${plplot${LIB_TAG}_LIB_SRCS} 
-    ${${SOURCE_ROOT_NAME}_SOURCE}
-    )
+    list(APPEND plplot${LIB_TAG}_LIB_SRCS ${${SOURCE_ROOT_NAME}_SOURCE})
+    if(SOURCE_ROOT_NAME STREQUAL "qt" AND PLD_qtwidget)
+      qt4_wrap_cpp(
+        QT_MOC_OUTFILES 
+	${CMAKE_SOURCE_DIR}/drivers/qt.h
+	OPTIONS "-DPLD_qtwidget=ON"
+	)
+      # message("QT_MOC_OUTFILES = ${QT_MOC_OUTFILES}")
+      set_source_files_properties(
+      ${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)
     if(${SOURCE_ROOT_NAME}_COMPILE_FLAGS)
       set_source_files_properties(
       ${${SOURCE_ROOT_NAME}_SOURCE}
@@ -137,6 +147,9 @@
 ${CMAKE_BINARY_DIR}
 ${CMAKE_BINARY_DIR}/include
 )
+if(NOT ENABLE_DYNDRIVERS AND PLD_cgm)
+  include_directories(${CMAKE_SOURCE_DIR}/lib/nistcd)
+endif(NOT ENABLE_DYNDRIVERS AND PLD_cgm)
 add_library(plplot${LIB_TAG} ${plplot${LIB_TAG}_LIB_SRCS})
 add_dependencies(plplot${LIB_TAG} plhershey-unicode.h_built)
 


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