diff options
| author | Brad King <brad.king@kitware.com> | 2016-08-15 12:59:43 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-08-15 12:59:43 (GMT) |
| commit | d47abe40b6532095fa28f5f1305e2ecad5feb6b7 (patch) | |
| tree | 01d2a2329bc0e89f570aad202eb4fdd337c2b24c /Modules/GetPrerequisites.cmake | |
| parent | 272a2bf19d26bb325ae5c9dda9a885c64016918d (diff) | |
| parent | a2d5c25a7a2b344ba7cf74d44c43bd6054263f59 (diff) | |
| download | CMake-d47abe40b6532095fa28f5f1305e2ecad5feb6b7.zip CMake-d47abe40b6532095fa28f5f1305e2ecad5feb6b7.tar.gz CMake-d47abe40b6532095fa28f5f1305e2ecad5feb6b7.tar.bz2 | |
Merge topic 'GetPrerequisites-fix-regression'
a2d5c25a GetPrerequisites: Fix regression in gp_resolved_file_type
Diffstat (limited to 'Modules/GetPrerequisites.cmake')
| -rw-r--r-- | Modules/GetPrerequisites.cmake | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Modules/GetPrerequisites.cmake b/Modules/GetPrerequisites.cmake index 2881e7f..58f5a92 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) |