diff options
| author | xyb <xyb@xyb.name> | 2020-09-05 10:45:48 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-05 10:45:48 -0700 |
| commit | fdac1fc5aa36e8edeb9f358f0fad041de2626215 (patch) | |
| tree | 56cdf5ea8aa709b27b2ea8c989af3c0b3f000117 /scripts/cmake | |
| parent | bd8af0789804dad0f76dced3f837845f086350c5 (diff) | |
| download | vcpkg-fdac1fc5aa36e8edeb9f358f0fad041de2626215.tar.gz vcpkg-fdac1fc5aa36e8edeb9f358f0fad041de2626215.zip | |
Add community triple arm64-linux and arm-linux. (#11880)
Verify the following command on both 32 bits and 64 bits OS on Raspberry pi 3.
./bootstrap-vcpkg.sh
./vcpkg install boost
Diffstat (limited to 'scripts/cmake')
| -rw-r--r-- | scripts/cmake/vcpkg_configure_cmake.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake index b443856f9..63d7f8786 100644 --- a/scripts/cmake/vcpkg_configure_cmake.cmake +++ b/scripts/cmake/vcpkg_configure_cmake.cmake @@ -150,7 +150,7 @@ function(vcpkg_configure_cmake) endif() # If we use Ninja, make sure it's on PATH - if(GENERATOR STREQUAL "Ninja") + if(GENERATOR STREQUAL "Ninja" AND NOT DEFINED ENV{VCPKG_FORCE_SYSTEM_BINARIES}) vcpkg_find_acquire_program(NINJA) get_filename_component(NINJA_PATH ${NINJA} DIRECTORY) vcpkg_add_to_path("${NINJA_PATH}") |