[Plplot-cvs] SF.net SVN: plplot: [8178] trunk/cmake/modules/cairo.cmake

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

Revision: 8178
          http://plplot.svn.sourceforge.net/plplot/?rev=8178&view=rev
Author:   airwin
Date:     2008-01-26 13:38:42 -0800 (Sat, 26 Jan 2008)

Log Message:
-----------
Only use cmake_link_flags macro for X link flags since pkg_check_pkgconfig
now calls this macro automatically for link_flags delivered by pkg-config.

Modified Paths:
--------------
    trunk/cmake/modules/cairo.cmake

Modified: trunk/cmake/modules/cairo.cmake
===================================================================
--- trunk/cmake/modules/cairo.cmake	2008-01-26 21:36:04 UTC (rev 8177)
+++ trunk/cmake/modules/cairo.cmake	2008-01-26 21:38:42 UTC (rev 8178)
@@ -83,42 +83,52 @@
 OR PLD_xcairo
 )
   pkg_check_pkgconfig(
-  "pangocairo"
+  pangocairo
   includedir
-  cairo_RPATH
+  linkdir
   linkflags 
   cflags
   _CAIRO
   )
   if(linkflags)
-    # Blank-delimited required.
+    set(cairo_RPATH ${linkdir})
     if(PLD_xcairo AND X11_COMPILE_FLAGS)
+      # Blank-delimited required.
       string(REGEX REPLACE ";" " " 
       cairo_COMPILE_FLAGS "${cflags} ${X11_COMPILE_FLAGS}"
       )
-      cmake_link_flags(cairo_LINK_FLAGS "${linkflags} -L${X11_LIBRARY_DIR} ${X11_LIBRARIES}")
+      # Convert X linker information to preferred CMake form before appending
+      # it to already converted ${linkflags}
+      cmake_link_flags(
+      cairo_X_LINK_FLAGS
+      "-L${X11_LIBRARY_DIR};${X11_LIBRARIES}"
+      )
+      set(cairo_LINK_FLAGS ${linkflags} ${cairo_X_LINK_FLAGS})
     else(PLD_xcairo AND X11_COMPILE_FLAGS)
       message(STATUS 
        "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.
       string(REGEX REPLACE ";" " " cairo_COMPILE_FLAGS "${cflags}")
-      cmake_link_flags(cairo_LINK_FLAGS "${linkflags}")
+      set(cairo_LINK_FLAGS ${linkflags})
     endif(PLD_xcairo AND X11_COMPILE_FLAGS)
     
-    # message("cairo_COMPILE_FLAGS = ${cairo_COMPILE_FLAGS}")
+    #message("cairo_COMPILE_FLAGS = ${cairo_COMPILE_FLAGS}")
+    #message("cairo_LINK_FLAGS = ${cairo_LINK_FLAGS}")
 
     list(APPEND DRIVERS_LINK_FLAGS ${cairo_LINK_FLAGS})
   else(linkflags)
-    #message("includedir = ${includedir}")
-    #message("libdir = ${libdir}")
-    #message("linkflags = ${linkflags}")
-    #message("cflags = ${cflags}")
+    message("includedir = ${includedir}")
+    message("libdir = ${libdir}")
+    message("linkflags = ${linkflags}")
+    message("cflags = ${cflags}")
     message(STATUS
-       "WARNING: pango or cairo not found with pkg-config.\n"
-    "   Setting cairo drivers to OFF.  Please install all of these packages\n"
-    "   and/or set 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)


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