[Cmake-commits] CMake branch, next, updated. v3.4.1-2005-g29b8a5b

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  29b8a5bbf4460d565822bd6e46a8ea08d9ffb166 (commit)
       via  53511936e43c14f362b1e1ba069a77f5ba251ccc (commit)
      from  d78f9e3595c1b901670e9d57c9620e792c797470 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=29b8a5bbf4460d565822bd6e46a8ea08d9ffb166
commit 29b8a5bbf4460d565822bd6e46a8ea08d9ffb166
Merge: d78f9e3 5351193
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 19 09:39:39 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 19 09:39:39 2016 -0500

    Merge topic 'FindPkgConfig-protect-semicolons' into next
    
    53511936 FindPkgConfig: Quote ${_pkgconfig_path} to protect semicolons on Windows


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=53511936e43c14f362b1e1ba069a77f5ba251ccc
commit 53511936e43c14f362b1e1ba069a77f5ba251ccc
Author:     Rob Gowin <robgowin at gmail.com>
AuthorDate: Fri Jan 15 18:43:53 2016 -0600
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 19 09:39:04 2016 -0500

    FindPkgConfig: Quote ${_pkgconfig_path} to protect semicolons on Windows

diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
index f24d2da..177e7b8 100644
--- a/Modules/FindPkgConfig.cmake
+++ b/Modules/FindPkgConfig.cmake
@@ -238,8 +238,8 @@ macro(_pkg_check_modules_internal _is_required _is_silent _no_cmake_path _no_cma
     if(NOT "${_extra_paths}" STREQUAL "")
       # Save the PKG_CONFIG_PATH environment variable, and add paths
       # from the CMAKE_PREFIX_PATH variables
-      set(_pkgconfig_path_old $ENV{PKG_CONFIG_PATH})
-      set(_pkgconfig_path ${_pkgconfig_path_old})
+      set(_pkgconfig_path_old "$ENV{PKG_CONFIG_PATH}")
+      set(_pkgconfig_path "${_pkgconfig_path_old}")
       if(NOT "${_pkgconfig_path}" STREQUAL "")
         file(TO_CMAKE_PATH "${_pkgconfig_path}" _pkgconfig_path)
       endif()
@@ -285,7 +285,7 @@ macro(_pkg_check_modules_internal _is_required _is_silent _no_cmake_path _no_cma
           string(REPLACE ";" ":" _pkgconfig_path "${_pkgconfig_path}")
           string(REPLACE "\\ " " " _pkgconfig_path "${_pkgconfig_path}")
         endif()
-        set(ENV{PKG_CONFIG_PATH} ${_pkgconfig_path})
+        set(ENV{PKG_CONFIG_PATH} "${_pkgconfig_path}")
       endif()
 
       # Unset variables
@@ -401,7 +401,7 @@ macro(_pkg_check_modules_internal _is_required _is_silent _no_cmake_path _no_cma
 
     if(NOT "${_extra_paths}" STREQUAL "")
       # Restore the environment variable
-      set(ENV{PKG_CONFIG_PATH} ${_pkgconfig_path_old})
+      set(ENV{PKG_CONFIG_PATH} "${_pkgconfig_path_old}")
     endif()
 
     unset(_extra_paths)

-----------------------------------------------------------------------

Summary of changes:
 Modules/FindPkgConfig.cmake |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake