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

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

Revision: 12977
          http://sourceforge.net/p/plplot/code/12977
Author:   airwin
Date:     2014-02-06 05:06:07 +0000 (Thu, 06 Feb 2014)
Log Message:
-----------
Fix recently introduced regression in the Linux case for PKG_CONFIG_ENV.

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

Modified: trunk/cmake/modules/pkg-config.cmake
===================================================================
--- trunk/cmake/modules/pkg-config.cmake	2014-02-06 05:04:19 UTC (rev 12976)
+++ trunk/cmake/modules/pkg-config.cmake	2014-02-06 05:06:07 UTC (rev 12977)
@@ -41,14 +41,28 @@
   message(STATUS "Looking for pkg-config - found")
   set(PKG_CONFIG_DIR "${LIB_DIR}/pkgconfig")
   set(env_PKG_CONFIG_PATH $ENV{PKG_CONFIG_PATH})
-  if(env_PKG_CONFIG_PATH)
-    set(_pkg_config_path "${PKG_CONFIG_DIR};${env_PKG_CONFIG_PATH}")
-  else(env_PKG_CONFIG_PATH)
-    set(_pkg_config_path "${PKG_CONFIG_DIR}")
-  endif(env_PKG_CONFIG_PATH)
 
+  # Will likely need WIN32 and CYGWIN stanzas as well
   if(MINGW)
+    if(env_PKG_CONFIG_PATH)
+      # On MinGW (and probably Cygwin and bare Windows) env_PKG_CONFIG_PATH
+      # is semi-colon delimited.
+      set(_pkg_config_path "${PKG_CONFIG_DIR};${env_PKG_CONFIG_PATH}")
+    else(env_PKG_CONFIG_PATH)
+      set(_pkg_config_path "${PKG_CONFIG_DIR}")
+    endif(env_PKG_CONFIG_PATH)
+    # Convert semi-colon delimited path string with colon drive
+    # letters to a colong delimited path form with slash drive letters
+    # that pkg-config configuration files can use.
     determine_msys_path(_pkg_config_path "${_pkg_config_path}")
+  else(MINGW)
+    # Only tested on Unix (Linux) so far where env_PKG_CONFIG_PATH
+    # is colon-delimited.
+    if(env_PKG_CONFIG_PATH)
+      set(_pkg_config_path "${PKG_CONFIG_DIR}:${env_PKG_CONFIG_PATH}")
+    else(env_PKG_CONFIG_PATH)
+      set(_pkg_config_path "${PKG_CONFIG_DIR}")
+    endif(env_PKG_CONFIG_PATH)
   endif(MINGW)
 
   set(PKG_CONFIG_ENV PKG_CONFIG_PATH="${_pkg_config_path}")

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