[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-845-g7b5da68

[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  7b5da6892d5b716c5382295d416232af3c1ba2c3 (commit)
       via  1c4cfca4270eea1be95f57935e9df72e4e3f8b88 (commit)
       via  16ce9a786c8552aaaebe8ab25427b1d916cd6c05 (commit)
      from  45b6ef2741674d9f8ff10d6e57a11c511804ad21 (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=7b5da6892d5b716c5382295d416232af3c1ba2c3
commit 7b5da6892d5b716c5382295d416232af3c1ba2c3
Merge: 45b6ef2 1c4cfca
Author:     Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
AuthorDate: Tue Mar 11 10:37:51 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Mar 11 10:37:51 2014 -0400

    Merge topic 'FindPkgConfig_Extend-PKG_CONFIG_PATH' into next
    
    1c4cfca4 FindPkgConfig: Remove empty values from the list
    16ce9a78 FindPkgConfig: Remove unneeded string replacement


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1c4cfca4270eea1be95f57935e9df72e4e3f8b88
commit 1c4cfca4270eea1be95f57935e9df72e4e3f8b88
Author:     Daniele E. Domenichelli <daniele.domenichelli at iit.it>
AuthorDate: Tue Mar 11 15:37:18 2014 +0100
Commit:     Daniele E. Domenichelli <daniele.domenichelli at iit.it>
CommitDate: Tue Mar 11 15:37:18 2014 +0100

    FindPkgConfig: Remove empty values from the list

diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
index fcb1c08..fee45b6 100644
--- a/Modules/FindPkgConfig.cmake
+++ b/Modules/FindPkgConfig.cmake
@@ -250,6 +250,8 @@ macro(_pkg_check_modules_internal _is_required _is_silent _no_cmake_path _no_cma
 
       # Prepare and set the environment variable
       if(NOT "${_pkgconfig_path}" STREQUAL "")
+        # remove empty values from the list
+        list(REMOVE_ITEM _pkgconfig_path "")
         file(TO_NATIVE_PATH "${_pkgconfig_path}" _pkgconfig_path)
         if(UNIX)
           string(REPLACE ";" ":" _pkgconfig_path "${_pkgconfig_path}")

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=16ce9a786c8552aaaebe8ab25427b1d916cd6c05
commit 16ce9a786c8552aaaebe8ab25427b1d916cd6c05
Author:     Daniele E. Domenichelli <daniele.domenichelli at iit.it>
AuthorDate: Tue Mar 11 15:36:50 2014 +0100
Commit:     Daniele E. Domenichelli <daniele.domenichelli at iit.it>
CommitDate: Tue Mar 11 15:36:50 2014 +0100

    FindPkgConfig: Remove unneeded string replacement

diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
index aacdc8f..fcb1c08 100644
--- a/Modules/FindPkgConfig.cmake
+++ b/Modules/FindPkgConfig.cmake
@@ -193,25 +193,16 @@ macro(_pkg_check_modules_internal _is_required _is_silent _no_cmake_path _no_cma
     if(NOT _no_cmake_environment_path)
       if(NOT "$ENV{CMAKE_PREFIX_PATH}" STREQUAL "")
         file(TO_CMAKE_PATH "$ENV{CMAKE_PREFIX_PATH}" _path)
-        if(UNIX)
-          string(REPLACE "\\:" ";" _path "${_path}")
-        endif()
         list(APPEND _extra_paths ${_path})
         unset(_path)
       endif()
       if(NOT "$ENV{CMAKE_FRAMEWORK_PATH}" STREQUAL "")
         file(TO_CMAKE_PATH "$ENV{CMAKE_FRAMEWORK_PATH}" _path)
-        if(UNIX)
-          string(REPLACE "\\:" ";" _path "${_path}")
-        endif()
         list(APPEND _extra_paths ${_path})
         unset(_path)
       endif()
       if(NOT "$ENV{CMAKE_APPBUNDLE_PATH}" STREQUAL "")
         file(TO_CMAKE_PATH "$ENV{CMAKE_APPBUNDLE_PATH}" _path)
-        if(UNIX)
-          string(REPLACE "\\:" ";" _path "${_path}")
-        endif()
         list(APPEND _extra_paths ${_path})
         unset(_path)
       endif()

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

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


hooks/post-receive
-- 
CMake