Merge topic 'GetPrerequisites-fix-find_program-call'

1d1f29f4 GetPrerequisites: Fix call to find_program for `ri` tool
This commit is contained in:
Brad King 2016-12-13 08:45:50 -05:00 committed by CMake Topic Stage
commit c241679956

View File

@ -430,8 +430,8 @@ function(gp_resolve_item context item exepath dirs resolved_item_var)
if(WIN32 AND NOT UNIX)
if(NOT resolved)
set(ri "ri-NOTFOUND")
find_program(ri "${item}" PATHS "${exepath};${dirs}" NO_DEFAULT_PATH)
find_program(ri "${item}" PATHS "${exepath};${dirs}")
find_program(ri "${item}" PATHS ${exepath} ${dirs} NO_DEFAULT_PATH)
find_program(ri "${item}" PATHS ${exepath} ${dirs})
if(ri)
#message(STATUS "info: 'find_program' in exepath/dirs (${ri})")
set(resolved 1)