Menu
▾
▴
plplot-cvs
|
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.
|
|
From: <hba...@us...> - 2009-06-17 02:53:10
|
Revision: 10052
http://plplot.svn.sourceforge.net/plplot/?rev=10052&view=rev
Author: hbabcock
Date: 2009-06-17 02:53:08 +0000 (Wed, 17 Jun 2009)
Log Message:
-----------
HPB for DG. A trivial comment fix to cairo cmake file.
Modified Paths:
--------------
trunk/cmake/modules/cairo.cmake
Modified: trunk/cmake/modules/cairo.cmake
===================================================================
--- trunk/cmake/modules/cairo.cmake 2009-06-16 19:27:55 UTC (rev 10051)
+++ trunk/cmake/modules/cairo.cmake 2009-06-17 02:53:08 UTC (rev 10052)
@@ -18,7 +18,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
# Configuration for the cairo device driver (supporting the memcairo,
-# pdfcairo, pngcairo, pscairo, svgcairo, memcairo, and xcairo devices).
+# pdfcairo, pngcairo, pscairo, svgcairo and xcairo devices).
#
# The following variables are set / modified
#
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2010-04-11 15:30:47
|
Revision: 10900
http://plplot.svn.sourceforge.net/plplot/?rev=10900&view=rev
Author: airwin
Date: 2010-04-11 15:30:41 +0000 (Sun, 11 Apr 2010)
Log Message:
-----------
Tweak wincairo disabling WARNING message when not a Windows platform.
Modified Paths:
--------------
trunk/cmake/modules/cairo.cmake
Modified: trunk/cmake/modules/cairo.cmake
===================================================================
--- trunk/cmake/modules/cairo.cmake 2010-04-11 15:20:51 UTC (rev 10899)
+++ trunk/cmake/modules/cairo.cmake 2010-04-11 15:30:41 UTC (rev 10900)
@@ -174,7 +174,7 @@
if(NOT WIN32)
message(STATUS
- "WARNING: Not a Windows Computer. Setting wincairo driver to OFF."
+ "WARNING: Not a Windows platform so setting wincairo driver to OFF."
)
set(PLD_wincairo OFF CACHE BOOL "Enable wincairo device" FORCE)
endif(NOT WIN32)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2010-04-13 14:19:00
|
Revision: 10912
http://plplot.svn.sourceforge.net/plplot/?rev=10912&view=rev
Author: airwin
Date: 2010-04-13 14:18:35 +0000 (Tue, 13 Apr 2010)
Log Message:
-----------
Tweak the wincairo message to remove the WARNING label from it since this is
just an informational message concerning a condition (this is not a Windows
platform) which the user can do nothing about on that platform.
We should also systematically drop the WARNING label from messages on other
platforms as well if they are just informational. Thus, WARNING messages
should be reserved for something the user has control over such as
downloading/installing more software. The ideal here is no WARNING messages
at all for fully loaded systems. With this change we have reestablished
that ideal on Linux, but this needs to be checked for other platforms as
well.
Modified Paths:
--------------
trunk/cmake/modules/cairo.cmake
Modified: trunk/cmake/modules/cairo.cmake
===================================================================
--- trunk/cmake/modules/cairo.cmake 2010-04-12 23:07:11 UTC (rev 10911)
+++ trunk/cmake/modules/cairo.cmake 2010-04-13 14:18:35 UTC (rev 10912)
@@ -174,7 +174,7 @@
if(NOT WIN32)
message(STATUS
- "WARNING: Not a Windows platform so setting wincairo driver to OFF."
- )
+ "Not a Windows platform so setting wincairo driver to OFF."
+ )
set(PLD_wincairo OFF CACHE BOOL "Enable wincairo device" FORCE)
endif(NOT WIN32)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2011-11-28 20:09:20
|
Revision: 12064
http://plplot.svn.sourceforge.net/plplot/?rev=12064&view=rev
Author: airwin
Date: 2011-11-28 20:09:14 +0000 (Mon, 28 Nov 2011)
Log Message:
-----------
Indentation fixups.
Modified Paths:
--------------
trunk/cmake/modules/cairo.cmake
Modified: trunk/cmake/modules/cairo.cmake
===================================================================
--- trunk/cmake/modules/cairo.cmake 2011-11-28 20:07:21 UTC (rev 12063)
+++ trunk/cmake/modules/cairo.cmake 2011-11-28 20:09:14 UTC (rev 12064)
@@ -49,19 +49,19 @@
# Look for cairo headers and libraries with pkg-config
if(
- PLD_memcairo
-OR PLD_pdfcairo
-OR PLD_pngcairo
-OR PLD_pscairo
-OR PLD_svgcairo
-OR PLD_xcairo
-OR PLD_extcairo
-OR PLD_wincairo
-)
+ PLD_memcairo
+ OR PLD_pdfcairo
+ OR PLD_pngcairo
+ OR PLD_pscairo
+ OR PLD_svgcairo
+ OR PLD_xcairo
+ OR PLD_extcairo
+ OR PLD_wincairo
+ )
if(NOT PKG_CONFIG_EXECUTABLE)
message(STATUS
- "WARNING: pkg-config not found. Setting cairo drivers to OFF."
- )
+ "WARNING: pkg-config not found. Setting cairo drivers to OFF."
+ )
set(PLD_memcairo OFF CACHE BOOL "Enable memcairo device" FORCE)
set(PLD_pdfcairo OFF CACHE BOOL "Enable pdfcairo device" FORCE)
set(PLD_pngcairo OFF CACHE BOOL "Enable pngcairo device" FORCE)
@@ -72,35 +72,35 @@
set(PLD_wincairo OFF CACHE BOOL "Enable wincairo device" FORCE)
endif(NOT PKG_CONFIG_EXECUTABLE)
endif(
- PLD_memcairo
-OR PLD_pdfcairo
-OR PLD_pngcairo
-OR PLD_pscairo
-OR PLD_svgcairo
-OR PLD_xcairo
-OR PLD_extcairo
-OR PLD_wincairo
-)
+ PLD_memcairo
+ OR PLD_pdfcairo
+ OR PLD_pngcairo
+ OR PLD_pscairo
+ OR PLD_svgcairo
+ OR PLD_xcairo
+ OR PLD_extcairo
+ OR PLD_wincairo
+ )
if(
- PLD_memcairo
-OR PLD_pdfcairo
-OR PLD_pngcairo
-OR PLD_pscairo
-OR PLD_svgcairo
-OR PLD_xcairo
-OR PLD_extcairo
-OR PLD_wincairo
-)
+ PLD_memcairo
+ OR PLD_pdfcairo
+ OR PLD_pngcairo
+ OR PLD_pscairo
+ OR PLD_svgcairo
+ OR PLD_xcairo
+ OR PLD_extcairo
+ OR PLD_wincairo
+ )
pkg_check_pkgconfig(
- pangocairo
- includedir
- linkdir
- linkflags
- cflags
- version
- _CAIRO
- )
+ pangocairo
+ includedir
+ linkdir
+ linkflags
+ cflags
+ version
+ _CAIRO
+ )
if(linkflags)
# Check that the pangocairo library version is recent
# enough to efficiently handle text clipping.
@@ -115,13 +115,13 @@
if(PLD_xcairo AND X11_COMPILE_FLAGS)
# Blank-delimited required.
string(REGEX REPLACE ";" " "
- cairo_COMPILE_FLAGS "${cflags} ${X11_COMPILE_FLAGS}"
- )
+ cairo_COMPILE_FLAGS "${cflags} ${X11_COMPILE_FLAGS}"
+ )
set(cairo_LINK_FLAGS ${linkflags} ${X11_LIBRARIES})
else(PLD_xcairo AND X11_COMPILE_FLAGS)
message(STATUS
- "WARNING: X windows not found. Setting xcairo driver to OFF."
- )
+ "WARNING: X windows not found. Setting xcairo driver to OFF."
+ )
# Blank-delimited required.
set(PLD_xcairo OFF CACHE BOOL "Enable xcairo device" FORCE)
# now deal with remaining cairo devices.
@@ -139,11 +139,11 @@
message("linkflags = ${linkflags}")
message("cflags = ${cflags}")
message(STATUS
- "WARNING: pango and/or cairo not found with pkg-config.\n"
- " Disabling cairo drivers. To enable these drivers you must install\n"
- " development versions of pango and cairo and/or set\n"
- " the environment variable PKG_CONFIG_PATH appropriately."
- )
+ "WARNING: pango and/or cairo not found with pkg-config.\n"
+ " Disabling cairo drivers. To enable these drivers you must install\n"
+ " development versions of pango and cairo and/or set\n"
+ " the environment variable PKG_CONFIG_PATH appropriately."
+ )
set(PLD_memcairo OFF CACHE BOOL "Enable memcairo device" FORCE)
set(PLD_pdfcairo OFF CACHE BOOL "Enable pdfcairo device" FORCE)
set(PLD_pngcairo OFF CACHE BOOL "Enable pngcairo device" FORCE)
@@ -154,15 +154,15 @@
set(PLD_wincairo OFF CACHE BOOL "Enable wincairo device" FORCE)
endif(linkflags)
endif(
- PLD_memcairo
-OR PLD_pdfcairo
-OR PLD_pngcairo
-OR PLD_pscairo
-OR PLD_svgcairo
-OR PLD_xcairo
-OR PLD_extcairo
-OR PLD_wincairo
-)
+ PLD_memcairo
+ OR PLD_pdfcairo
+ OR PLD_pngcairo
+ OR PLD_pscairo
+ OR PLD_svgcairo
+ OR PLD_xcairo
+ OR PLD_extcairo
+ OR PLD_wincairo
+ )
if(NOT PLD_xcairo)
set(extXdrawable_true "#")
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <arj...@us...> - 2014-04-30 08:10:07
|
Revision: 13114
http://sourceforge.net/p/plplot/code/13114
Author: arjenmarkus
Date: 2014-04-30 08:10:03 +0000 (Wed, 30 Apr 2014)
Log Message:
-----------
Make sure messages about the wincairo device are only printed if this device is considered at all. This to prevent confusion - if you do not want the device (or the driver in general), there should be no message.
Modified Paths:
--------------
trunk/cmake/modules/cairo.cmake
Modified: trunk/cmake/modules/cairo.cmake
===================================================================
--- trunk/cmake/modules/cairo.cmake 2014-04-29 18:18:45 UTC (rev 13113)
+++ trunk/cmake/modules/cairo.cmake 2014-04-30 08:10:03 UTC (rev 13114)
@@ -24,23 +24,23 @@
#
# 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.
-# PLD_pscairo - ON means the pscairo device is enabled.
-# PLD_epscairo - ON means the epscairo device is enabled.
-# PLD_svgcairo - ON means the svgcairo device is enabled.
-# PLD_xcairo - ON means the xcairo device is enabled.
+# PLD_pdfcairo - ON means the pdfcairo device is enabled.
+# PLD_pngcairo - ON means the pngcairo device is enabled.
+# PLD_pscairo - ON means the pscairo device is enabled.
+# PLD_epscairo - ON means the epscairo device is enabled.
+# PLD_svgcairo - ON means the svgcairo device is enabled.
+# PLD_xcairo - ON means the xcairo device is enabled.
# PLD_wincairo - ON means the wincairo device is enabled.
-# cairo_COMPILE_FLAGS - Blank-delimited COMPILE_FLAGS required to
-# compile cairo device drivers.
-# cairo_LINK_FLAGS - list of full path names of libraries and
-# linker flags for dynamic cairo device driver.
-# cairo_RPATH - RPATH directory list for cairo device driver.
-# current assumption is the list only has one
-# element corresponding to the pkg-config libdir
-# variable for pangocairo.
-# DRIVERS_LINK_FLAGS - list of device LINK_FLAGS for case
-# when ENABLE_DYNDRIVERS OFF.
+# cairo_COMPILE_FLAGS - Blank-delimited COMPILE_FLAGS required to
+# compile cairo device drivers.
+# cairo_LINK_FLAGS - list of full path names of libraries and
+# linker flags for dynamic cairo device driver.
+# cairo_RPATH - RPATH directory list for cairo device driver.
+# current assumption is the list only has one
+# element corresponding to the pkg-config libdir
+# variable for pangocairo.
+# DRIVERS_LINK_FLAGS - list of device LINK_FLAGS for case
+# when ENABLE_DYNDRIVERS OFF.
# Include file searches use FindPath. To add extra search directories
# set the environment variable CMAKE_INCLUDE_PATH.
@@ -125,13 +125,13 @@
if(PLD_xcairo AND X11_COMPILE_FLAGS)
# Blank-delimited required.
string(REGEX REPLACE ";" " "
- cairo_COMPILE_FLAGS "${cflags} ${X11_COMPILE_FLAGS}"
- )
+ cairo_COMPILE_FLAGS "${cflags} ${X11_COMPILE_FLAGS}"
+ )
set(cairo_LINK_FLAGS ${linkflags} ${X11_LIBRARIES})
else(PLD_xcairo AND X11_COMPILE_FLAGS)
message(STATUS
- "WARNING: X windows not found. Setting xcairo driver to OFF."
- )
+ "WARNING: X windows not found. Setting xcairo driver to OFF."
+ )
# Blank-delimited required.
set(PLD_xcairo OFF CACHE BOOL "Enable xcairo device" FORCE)
# now deal with remaining cairo devices.
@@ -184,16 +184,18 @@
set(extcairo_true "#")
endif(NOT PLD_extcairo)
-if(NOT WIN32_OR_CYGWIN)
- message(STATUS
- "Not a Windows platform so setting wincairo driver to OFF."
- )
- set(PLD_wincairo OFF CACHE BOOL "Enable wincairo device" FORCE)
-else(NOT WIN32_OR_CYGWIN)
- if(CYGWIN)
+if(PLD_wincairo)
+ if(NOT WIN32_OR_CYGWIN)
message(STATUS
- "Cygwin does not currently provide support for the wincairo driver - turning this OFF."
+ "Not a Windows platform so setting wincairo driver to OFF."
)
set(PLD_wincairo OFF CACHE BOOL "Enable wincairo device" FORCE)
- endif(CYGWIN)
-endif(NOT WIN32_OR_CYGWIN)
+ else(NOT WIN32_OR_CYGWIN)
+ if(CYGWIN)
+ message(STATUS
+ "Cygwin does not currently provide support for the wincairo driver - turning this OFF."
+ )
+ set(PLD_wincairo OFF CACHE BOOL "Enable wincairo device" FORCE)
+ endif(CYGWIN)
+ endif(NOT WIN32_OR_CYGWIN)
+endif(PLD_wincairo)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X