[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-1022-gc126b8c

[Daniele E. Domenichelli]

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  c126b8c14505282cc22af4b719b58114f78c83f7 (commit)
       via  7ccae4dd5c9f859845871ce43d4f33f46d2f3e7c (commit)
       via  17f471d01bc5cf92be93c1e03241fbb9d1bd8d77 (commit)
       via  f92203ba4955878f4fdb969c2078a91f7f9c2dac (commit)
      from  03ce61a5017fb475019b778146c9bc9d107114a7 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c126b8c14505282cc22af4b719b58114f78c83f7
commit c126b8c14505282cc22af4b719b58114f78c83f7
Merge: 03ce61a 7ccae4d
Author:     Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
AuthorDate: Fri Mar 14 07:15:13 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Mar 14 07:15:13 2014 -0400

    Merge topic 'FindPkgConfig_Extend-PKG_CONFIG_PATH' into next
    
    7ccae4dd FindPkgConfig - Unit tests: Add quotes when setting CMAKE_PREFIX_PATH
    17f471d0 FindPkgConfig - Unit tests: Fix dummy pkg-config scripts
    f92203ba FindPkgConfig: Fix TO_NATIVE_PATH escaping white spaces


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7ccae4dd5c9f859845871ce43d4f33f46d2f3e7c
commit 7ccae4dd5c9f859845871ce43d4f33f46d2f3e7c
Author:     Daniele E. Domenichelli <daniele.domenichelli at iit.it>
AuthorDate: Fri Mar 14 12:12:13 2014 +0100
Commit:     Daniele E. Domenichelli <daniele.domenichelli at iit.it>
CommitDate: Fri Mar 14 12:14:37 2014 +0100

    FindPkgConfig - Unit tests: Add quotes when setting CMAKE_PREFIX_PATH
    
    This should fix when CMAKE_CURRENT_SOURCE_DIR contains a white space

diff --git a/Tests/RunCMake/FindPkgConfig/FindPkgConfig_PKGCONFIG_PATH.cmake b/Tests/RunCMake/FindPkgConfig/FindPkgConfig_PKGCONFIG_PATH.cmake
index e218247..5f9913f 100644
--- a/Tests/RunCMake/FindPkgConfig/FindPkgConfig_PKGCONFIG_PATH.cmake
+++ b/Tests/RunCMake/FindPkgConfig/FindPkgConfig_PKGCONFIG_PATH.cmake
@@ -3,7 +3,7 @@ enable_language(C)
 
 # Prepare environment and variables
 set(PKG_CONFIG_USE_CMAKE_PREFIX_PATH TRUE)
-set(CMAKE_PREFIX_PATH ${CMAKE_CURRENT_SOURCE_DIR}/pc-foo)
+set(CMAKE_PREFIX_PATH "${CMAKE_CURRENT_SOURCE_DIR}/pc-foo")
 if(WIN32)
     set(PKG_CONFIG_EXECUTABLE "${CMAKE_CURRENT_SOURCE_DIR}\\dummy-pkg-config.bat")
     set(ENV{CMAKE_PREFIX_PATH} "${CMAKE_CURRENT_SOURCE_DIR}\\pc-bar;X:\\this\\directory\\should\\not\\exist\\in\\the\\filesystem")

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=17f471d01bc5cf92be93c1e03241fbb9d1bd8d77
commit 17f471d01bc5cf92be93c1e03241fbb9d1bd8d77
Author:     Daniele E. Domenichelli <daniele.domenichelli at iit.it>
AuthorDate: Fri Mar 14 12:04:25 2014 +0100
Commit:     Daniele E. Domenichelli <daniele.domenichelli at iit.it>
CommitDate: Fri Mar 14 12:14:27 2014 +0100

    FindPkgConfig - Unit tests: Fix dummy pkg-config scripts

diff --git a/Tests/RunCMake/FindPkgConfig/dummy-pkg-config.bat b/Tests/RunCMake/FindPkgConfig/dummy-pkg-config.bat
index f068897..b2096ed 100755
--- a/Tests/RunCMake/FindPkgConfig/dummy-pkg-config.bat
+++ b/Tests/RunCMake/FindPkgConfig/dummy-pkg-config.bat
@@ -8,7 +8,8 @@ IF "%1"=="--version" (
 )
 
 IF "%1"=="--exists" (
-  IF NOT "%2"=="%PKG_CONFIG_PATH%" (
+  SHIFT
+  IF NOT "%*"=="%PKG_CONFIG_PATH%" (
     EXIT /B 1
   )
 )
diff --git a/Tests/RunCMake/FindPkgConfig/dummy-pkg-config.sh b/Tests/RunCMake/FindPkgConfig/dummy-pkg-config.sh
index e0e6a54..e62bb74 100755
--- a/Tests/RunCMake/FindPkgConfig/dummy-pkg-config.sh
+++ b/Tests/RunCMake/FindPkgConfig/dummy-pkg-config.sh
@@ -9,7 +9,10 @@ case $1 in
     echo "0.0-cmake-dummy"
     ;;
   --exists)
-    [ "$2" = "${PKG_CONFIG_PATH}" ] || exit 1
+    shift
+    echo "$@"
+    echo "${PKG_CONFIG_PATH}"
+    [ "$@" = "${PKG_CONFIG_PATH}" ] || exit 1
     ;;
   *)
     exit 255

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f92203ba4955878f4fdb969c2078a91f7f9c2dac
commit f92203ba4955878f4fdb969c2078a91f7f9c2dac
Author:     Daniele E. Domenichelli <daniele.domenichelli at iit.it>
AuthorDate: Fri Mar 14 12:05:55 2014 +0100
Commit:     Daniele E. Domenichelli <daniele.domenichelli at iit.it>
CommitDate: Fri Mar 14 12:14:17 2014 +0100

    FindPkgConfig: Fix TO_NATIVE_PATH escaping white spaces
    
    White spaces in the environment variables should not be escaped

diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
index fee45b6..812bb92 100644
--- a/Modules/FindPkgConfig.cmake
+++ b/Modules/FindPkgConfig.cmake
@@ -255,6 +255,7 @@ macro(_pkg_check_modules_internal _is_required _is_silent _no_cmake_path _no_cma
         file(TO_NATIVE_PATH "${_pkgconfig_path}" _pkgconfig_path)
         if(UNIX)
           string(REPLACE ";" ":" _pkgconfig_path "${_pkgconfig_path}")
+          string(REPLACE "\\ " " " _pkgconfig_path "${_pkgconfig_path}")
         endif()
         set(ENV{PKG_CONFIG_PATH} ${_pkgconfig_path})
       endif()

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

Summary of changes:
 Modules/FindPkgConfig.cmake                                     |    1 +
 Tests/RunCMake/FindPkgConfig/FindPkgConfig_PKGCONFIG_PATH.cmake |    2 +-
 Tests/RunCMake/FindPkgConfig/dummy-pkg-config.bat               |    3 ++-
 Tests/RunCMake/FindPkgConfig/dummy-pkg-config.sh                |    5 ++++-
 4 files changed, 8 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake