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

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

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

Log Message:
-----------
Build -dev cgm correctly when dynamic devices are not enabled.  The
internally built lib/nistcd is now handled in a similar way to how the other
internal libraries in lib.

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

Modified: trunk/cmake/modules/cgm.cmake
===================================================================
--- trunk/cmake/modules/cgm.cmake	2009-03-10 19:50:01 UTC (rev 9703)
+++ trunk/cmake/modules/cgm.cmake	2009-03-10 19:57:42 UTC (rev 9704)
@@ -23,14 +23,7 @@
 #
 # cgm_TARGETS	     - list of targets which the cgm dynamic device
 # 		       depends on.
-# cgm_COMPILE_FLAGS	  - individual COMPILE_FLAGS required to compile cgm
-# 			    device.
-# DRIVERS_LINK_FLAGS - list of targets which the cgm static device
-# 		       depends on.
 
 if(PLD_cgm)
   set(cgm_TARGETS nistcd)
-  set(cgm_COMPILE_FLAGS "-I${CMAKE_SOURCE_DIR}/lib/nistcd")
-  
-  set(DRIVERS_LINK_FLAGS ${DRIVERS_LINK_FLAGS} nistcd)
 endif(PLD_cgm)

Modified: trunk/src/CMakeLists.txt
===================================================================
--- trunk/src/CMakeLists.txt	2009-03-10 19:50:01 UTC (rev 9703)
+++ trunk/src/CMakeLists.txt	2009-03-10 19:57:42 UTC (rev 9704)
@@ -147,9 +147,6 @@
 ${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)
 
@@ -206,6 +203,15 @@
   )
 endif(HAVE_QHULL)
 
+if(NOT ENABLE_DYNDRIVERS AND PLD_cgm)
+  list(APPEND  libplplot${LIB_TAG}_LINK_LIBRARIES nistcd)
+  set(
+  libplplot${LIB_TAG}_LINK_FLAGS
+  "${libplplot${LIB_TAG}_LINK_FLAGS} -lnistcd"
+  )
+  include_directories(${CMAKE_SOURCE_DIR}/lib/nistcd)
+endif(NOT ENABLE_DYNDRIVERS AND PLD_cgm)
+
 set(
   libplplot${LIB_TAG}_LINK_LIBRARIES
   ${libplplot${LIB_TAG}_LINK_LIBRARIES}


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