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

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

Revision: 9808
          http://plplot.svn.sourceforge.net/plplot/?rev=9808&view=rev
Author:   airwin
Date:     2009-04-16 22:36:09 +0000 (Thu, 16 Apr 2009)

Log Message:
-----------
Make qt4_wrap_cpp OPTIONS consistent with qt.h code which only checks of
option is defined and not whether it is YES/NO.

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

Modified: trunk/drivers/CMakeLists.txt
===================================================================
--- trunk/drivers/CMakeLists.txt	2009-04-16 17:13:42 UTC (rev 9807)
+++ trunk/drivers/CMakeLists.txt	2009-04-16 22:36:09 UTC (rev 9808)
@@ -91,24 +91,32 @@
 	)
     endif(${SOURCE_ROOT_NAME}_COMPILE_FLAGS)
     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=${PLD_qtwidget} -DPLD_extqt=${PLD_extqt}
-	)
-      # 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(PLD_qtwidget OR PLD_extqt)
+      set(MOC_OPTIONS)
+      if(PLD_qtwidget)
+	list(APPEND MOC_OPTIONS -DPLD_qtwidget)
+      endif(PLD_qtwidget)
+      if(PLD_extqt)
+	list(APPEND MOC_OPTIONS -DPLD_extqt)
+      endif(PLD_extqt)
+      if(MOC_OPTIONS)
+	qt4_wrap_cpp(
+          QT_MOC_OUTFILES
+          ${CMAKE_CURRENT_SOURCE_DIR}/qt.h
+          OPTIONS ${MOC_OPTIONS}
+          )
+	# 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(MOC_OPTIONS)
         add_library(${SOURCE_ROOT_NAME} MODULE ${${SOURCE_ROOT_NAME}_SOURCE})
-      endif(PLD_qtwidget OR PLD_extqt)
+      endif(MOC_OPTIONS)
     else(SOURCE_ROOT_NAME STREQUAL "qt")
-        add_library(${SOURCE_ROOT_NAME} MODULE ${${SOURCE_ROOT_NAME}_SOURCE})
+      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-16 17:13:42 UTC (rev 9807)
+++ trunk/src/CMakeLists.txt	2009-04-16 22:36:09 UTC (rev 9808)
@@ -100,20 +100,27 @@
   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")
-      if(PLD_qtwidget OR PLD_extqt)
-      qt4_wrap_cpp(
-        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"
-        )
-      list(APPEND plplot${LIB_TAG}_LIB_SRCS ${QT_MOC_OUTFILES})
-      endif(PLD_qtwidget OR PLD_extqt)
+    if(SOURCE_ROOT_NAME STREQUAL "qt")
+      set(MOC_OPTIONS)
+      if(PLD_qtwidget)
+	list(APPEND MOC_OPTIONS -DPLD_qtwidget)
+      endif(PLD_qtwidget)
+      if(PLD_extqt)
+	list(APPEND MOC_OPTIONS -DPLD_extqt)
+      endif(PLD_extqt)
+      if(MOC_OPTIONS)
+	qt4_wrap_cpp(
+          QT_MOC_OUTFILES
+          ${CMAKE_CURRENT_SOURCE_DIR}/qt.h
+          OPTIONS ${MOC_OPTIONS}
+          )
+	# 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(MOC_OPTIONS)
     endif(SOURCE_ROOT_NAME STREQUAL "qt")
 
     if(${SOURCE_ROOT_NAME}_COMPILE_FLAGS)


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