diff options
| author | Brad King <brad.king@kitware.com> | 2016-08-12 14:29:12 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-08-12 14:29:12 (GMT) |
| commit | fc552ce1c70e702d26508261090a07ebe1c426a1 (patch) | |
| tree | 77704c88d664a51dc0f0ba21e05fd8513d8a4125 /Modules | |
| parent | 7da3df3fb617f4fc87d7fbc672e4968120a2ca7b (diff) | |
| parent | a2d5c25a7a2b344ba7cf74d44c43bd6054263f59 (diff) | |
| download | CMake-fc552ce1c70e702d26508261090a07ebe1c426a1.zip CMake-fc552ce1c70e702d26508261090a07ebe1c426a1.tar.gz CMake-fc552ce1c70e702d26508261090a07ebe1c426a1.tar.bz2 | |
Merge branch 'GetPrerequisites-fix-regression' into release
Diffstat (limited to 'Modules')
| -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 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) |