[Cmake-commits] CMake branch, next, updated. v3.5.0-rc3-368-g4c7858b

[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  4c7858bec811a3f20a3c52032935e0d255a6cfbf (commit)
       via  37e8ccee54dc76f8efc9717a063414f45f85530f (commit)
      from  2a32a8781372858dbf0e45b82a6f41a12f42b94d (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=4c7858bec811a3f20a3c52032935e0d255a6cfbf
commit 4c7858bec811a3f20a3c52032935e0d255a6cfbf
Merge: 2a32a87 37e8cce
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 8 09:13:51 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Mar 8 09:13:51 2016 -0500

    Merge topic 'GetPrerequisites-canonical-path' into next
    
    37e8ccee GetPrerequisites: Fix gp_resolved_file_type on non-canonical paths


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=37e8ccee54dc76f8efc9717a063414f45f85530f
commit 37e8ccee54dc76f8efc9717a063414f45f85530f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 8 09:08:54 2016 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Mar 8 09:08:54 2016 -0500

    GetPrerequisites: Fix gp_resolved_file_type on non-canonical paths
    
    Canonicalize the input paths so we treat them both consistently,
    in particular when comparing them via string operations.  This
    is needed for calls like
    
        fixup_bundle("${CMAKE_INSTALL_PREFIX}/../test" ...)
    
    Suggested-by: Benjamin Ballet <bballet at ivsweb.com>

diff --git a/Modules/GetPrerequisites.cmake b/Modules/GetPrerequisites.cmake
index 391e7f8..9ea1281 100644
--- a/Modules/GetPrerequisites.cmake
+++ b/Modules/GetPrerequisites.cmake
@@ -500,6 +500,7 @@ function(gp_resolved_file_type original_file file exepath dirs type_var)
   if(NOT IS_ABSOLUTE "${original_file}")
     message(STATUS "warning: gp_resolved_file_type expects absolute full path for first arg original_file")
   endif()
+  get_filename_component(original_file "${original_file}" ABSOLUTE) # canonicalize path
 
   set(is_embedded 0)
   set(is_local 0)
@@ -515,6 +516,7 @@ function(gp_resolved_file_type original_file file exepath dirs type_var)
     if(NOT IS_ABSOLUTE "${file}")
       gp_resolve_item("${original_file}" "${file}" "${exepath}" "${dirs}" resolved_file "${rpaths}")
     endif()
+    get_filename_component(resolved_file "${resolved_file}" ABSOLUTE) # canonicalize path
 
     string(TOLOWER "${original_file}" original_lower)
     string(TOLOWER "${resolved_file}" lower)

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

Summary of changes:
 Modules/GetPrerequisites.cmake |    2 ++
 1 file changed, 2 insertions(+)


hooks/post-receive
-- 
CMake