diff options
| author | Brad King <brad.king@kitware.com> | 2017-02-24 14:31:41 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2017-02-24 14:31:41 (GMT) |
| commit | fd14f8733934469a524d3f2be595aba20c47c82c (patch) | |
| tree | 982219611cf7b91a649bb5f4369f6c1f907509eb /Modules | |
| parent | 32f13fbe09fc8a5814bb3137abf2158cf1e24807 (diff) | |
| parent | eacf7decbf78a184cdad7a6fd533aa4f433ec27f (diff) | |
| download | CMake-fd14f8733934469a524d3f2be595aba20c47c82c.zip CMake-fd14f8733934469a524d3f2be595aba20c47c82c.tar.gz CMake-fd14f8733934469a524d3f2be595aba20c47c82c.tar.bz2 | |
Merge topic 'GetPrerequisites-find_item_basename'
eacf7dec GetPrerequisites: also try to resolve just the basename
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/GetPrerequisites.cmake | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Modules/GetPrerequisites.cmake b/Modules/GetPrerequisites.cmake index 1b23800..417af7c 100644 --- a/Modules/GetPrerequisites.cmake +++ b/Modules/GetPrerequisites.cmake @@ -399,6 +399,11 @@ function(gp_resolve_item context item exepath dirs resolved_item_var) set(ri "ri-NOTFOUND") find_file(ri "${item}" ${exepath} ${dirs} NO_DEFAULT_PATH) find_file(ri "${item}" ${exepath} ${dirs} /usr/lib) + + get_filename_component(basename_item "${item}" NAME) + find_file(ri "${basename_item}" PATHS ${exepath} ${dirs} NO_DEFAULT_PATH) + find_file(ri "${basename_item}" PATHS /usr/lib) + if(ri) #message(STATUS "info: 'find_file' in exepath/dirs (${ri})") set(resolved 1) |