[Cmake-commits] CMake branch, next, updated. v3.6.1-1241-g2cd471c

[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  2cd471cea4e4101180871087aa4d3080e0a040ac (commit)
       via  a2d5c25a7a2b344ba7cf74d44c43bd6054263f59 (commit)
      from  4f29b3241f92887edc055c98b033953d2adea973 (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=2cd471cea4e4101180871087aa4d3080e0a040ac
commit 2cd471cea4e4101180871087aa4d3080e0a040ac
Merge: 4f29b32 a2d5c25
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Aug 12 10:31:08 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Aug 12 10:31:08 2016 -0400

    Merge topic 'GetPrerequisites-fix-regression' into next
    
    a2d5c25a GetPrerequisites: Fix regression in gp_resolved_file_type


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a2d5c25a7a2b344ba7cf74d44c43bd6054263f59
commit a2d5c25a7a2b344ba7cf74d44c43bd6054263f59
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Aug 12 10:18:43 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Aug 12 10:24:48 2016 -0400

    GetPrerequisites: Fix regression in gp_resolved_file_type
    
    Since commit v3.6.0-rc1~287^2 (GetPrerequisites: Fix
    gp_resolved_file_type on non-canonical paths, 2016-03-08) we
    accidentally convert relative paths (e.g. system dll file names) to
    absolute paths even when we do not know the base directory.  Fix this by
    canonicalizing only paths that are already absolute.
    
    Closes: #16240

diff --git a/Modules/GetPrerequisites.cmake b/Modules/GetPrerequisites.cmake
index aa5bf28..fb7bf93 100644
--- a/Modules/GetPrerequisites.cmake
+++ b/Modules/GetPrerequisites.cmake
@@ -500,7 +500,9 @@ 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
+  if(IS_ABSOLUTE "${original_file}")
+    get_filename_component(original_file "${original_file}" ABSOLUTE) # canonicalize path
+  endif()
 
   set(is_embedded 0)
   set(is_local 0)
@@ -516,7 +518,9 @@ 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
+    if(IS_ABSOLUTE "${resolved_file}")
+      get_filename_component(resolved_file "${resolved_file}" ABSOLUTE) # canonicalize path
+    endif()
 
     string(TOLOWER "${original_file}" original_lower)
     string(TOLOWER "${resolved_file}" lower)

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

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


hooks/post-receive
-- 
CMake