|
From: <hba...@us...> - 2009-03-04 00:04:27
|
Revision: 9671
http://plplot.svn.sourceforge.net/plplot/?rev=9671&view=rev
Author: hbabcock
Date: 2009-03-04 00:04:26 +0000 (Wed, 04 Mar 2009)
Log Message:
-----------
Modified so that the extcairo device would build properly even if it is the only cairo device requested.
Modified Paths:
--------------
trunk/cmake/modules/cairo.cmake
Modified: trunk/cmake/modules/cairo.cmake
===================================================================
--- trunk/cmake/modules/cairo.cmake 2009-03-03 21:17:10 UTC (rev 9670)
+++ trunk/cmake/modules/cairo.cmake 2009-03-04 00:04:26 UTC (rev 9671)
@@ -22,6 +22,7 @@
#
# The following variables are set / modified
#
+# PLD_extcairo - ON means the extcairo device is enabled.
# PLD_memcairo - ON means the memcairo device is enabled.
# PLD_pdfcairo - ON means the pdfcairo device is enabled.
# PLD_pngcairo - ON means the pngcairo device is enabled.
@@ -53,6 +54,7 @@
OR PLD_pscairo
OR PLD_svgcairo
OR PLD_xcairo
+OR PLD_extcairo
)
if(NOT PKG_CONFIG_EXECUTABLE)
message(STATUS
@@ -64,6 +66,7 @@
set(PLD_pscairo OFF CACHE BOOL "Enable pscairo device" FORCE)
set(PLD_svgcairo OFF CACHE BOOL "Enable svgcairo device" FORCE)
set(PLD_xcairo OFF CACHE BOOL "Enable xcairo device" FORCE)
+ set(PLD_extcairo OFF CACHE BOOL "Enable extcairo device" FORCE)
endif(NOT PKG_CONFIG_EXECUTABLE)
endif(
PLD_memcairo
@@ -72,6 +75,7 @@
OR PLD_pscairo
OR PLD_svgcairo
OR PLD_xcairo
+OR PLD_extcairo
)
if(
@@ -81,6 +85,7 @@
OR PLD_pscairo
OR PLD_svgcairo
OR PLD_xcairo
+OR PLD_extcairo
)
pkg_check_pkgconfig(
pangocairo
@@ -130,6 +135,7 @@
set(PLD_pscairo OFF CACHE BOOL "Enable pscairo device" FORCE)
set(PLD_svgcairo OFF CACHE BOOL "Enable svgcairo device" FORCE)
set(PLD_xcairo OFF CACHE BOOL "Enable xcairo device" FORCE)
+ set(PLD_extcairo OFF CACHE BOOL "Enable extcairo device" FORCE)
endif(linkflags)
endif(
PLD_memcairo
@@ -138,4 +144,5 @@
OR PLD_pscairo
OR PLD_svgcairo
OR PLD_xcairo
+OR PLD_extcairo
)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|