mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-06-07 08:48:28 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[vcpkg/scripts] Fix ninja search path on windows and find binaries within vcpkg first (#11105)

Browse Source 
* [vcpkg/scripts] fix wrong paths variable on windows

* [vcpkg/scripts] search within vcpkg first and then ask the rest of the world

* [vcpkg/scripts] add second search path for ninja.
First is for vcpkg fetch ninja
Second is for vcpkg_find_acquire_program
This commit is contained in:
Alexander Neumann 2020-05-06 22:52:51 +02:00 committed by GitHub
parent 9614c6a962
commit 0bbf4400e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/cmake/vcpkg_find_acquire_program.cmake
View File

@ -176,7 +176,8 @@ function(vcpkg_find_acquire_program VAR)
set(PROGNAME ninja)
set(SUBDIR "ninja-1.10.0")
if(CMAKE_HOST_WIN32)
set(PATHS "${DOWNLOADS}/tools/ninja/${SUBDIR}")
set(PATHS "${DOWNLOADS}/tools/${SUBDIR}-windows")
list(APPEND PATHS "${DOWNLOADS}/tools/ninja/${SUBDIR}")
elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin")
set(PATHS "${DOWNLOADS}/tools/${SUBDIR}-osx")
elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "FreeBSD")
@ -320,10 +321,12 @@ function(vcpkg_find_acquire_program VAR)
macro(do_find)
if(NOT DEFINED REQUIRED_INTERPRETER)
find_program(${VAR} ${PROGNAME} PATHS ${PATHS})
find_program(${VAR} ${PROGNAME} PATHS ${PATHS} NO_DEFAULT_PATH)
find_program(${VAR} ${PROGNAME})
else()
vcpkg_find_acquire_program(${REQUIRED_INTERPRETER})
find_file(SCRIPT_${VAR} ${SCRIPTNAME} PATHS ${PATHS})
find_file(SCRIPT_${VAR} ${SCRIPTNAME} PATHS ${PATHS} NO_DEFAULT_PATH)
find_file(SCRIPT_${VAR} ${SCRIPTNAME})
set(${VAR} ${${REQUIRED_INTERPRETER}} ${SCRIPT_${VAR}})
endif()
endmacro()