Browse Source

Merge topic 'GetPrerequisites-fix-regression'

a2d5c25a GetPrerequisites: Fix regression in gp_resolved_file_type
Brad King 9 years ago
parent
commit
d47abe40b6
1 changed files with 6 additions and 2 deletions
  1. 6 2
      Modules/GetPrerequisites.cmake

+ 6 - 2
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)