[Plplot-cvs] SF.net SVN: plplot:[12063] trunk/cmake/modules/pkg-config.cmake

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

Revision: 12063
          http://plplot.svn.sourceforge.net/plplot/?rev=12063&view=rev
Author:   airwin
Date:     2011-11-28 20:07:21 +0000 (Mon, 28 Nov 2011)
Log Message:
-----------
Use ${_prefix}_VERSION} rather than ${_xprefix}_VERSION} in
pkg_check_pkgconfig macro because the latter is not defined.  This
fixes a FORCE_EXTERNAL_STATIC bug.

Modified Paths:
--------------
    trunk/cmake/modules/pkg-config.cmake

Modified: trunk/cmake/modules/pkg-config.cmake
===================================================================
--- trunk/cmake/modules/pkg-config.cmake	2011-11-28 20:03:20 UTC (rev 12062)
+++ trunk/cmake/modules/pkg-config.cmake	2011-11-28 20:07:21 UTC (rev 12063)
@@ -94,7 +94,9 @@
     set(${_include_DIR} ${${_xprefix}_INCLUDE_DIRS})
     set(${_link_DIR}    ${${_xprefix}_LIBRARY_DIRS})
     set(${_cflags}      ${${_xprefix}_CFLAGS})
-    set(${_version}     ${${_xprefix}_VERSION})
+    # N.B. must use ${_prefix}_VERSION} rather than ${_xprefix}_VERSION}
+    # because the latter is not defined.
+    set(${_version}     ${${_prefix}_VERSION})
     set(_return_VALUE 0)
   else(${_prefix}_FOUND)
     set(${_include_DIR})
@@ -109,6 +111,7 @@
   #message("${_link_DIR} = ${${_link_DIR}}")
   #message("${_link_FLAGS} = ${${_link_FLAGS}}")
   #message("${_cflags} = ${${_cflags}}")
+  #message("${_version} = ${${_version}}")
 endmacro(pkg_check_pkgconfig)
 
 macro(pkg_config_link_flags _link_flags_out _link_flags_in)

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