diff options
| author | Victor Romero Sanchez <viromer@microsoft.com> | 2019-01-08 15:51:24 -0800 |
|---|---|---|
| committer | Victor Romero Sanchez <viromer@microsoft.com> | 2019-01-08 15:51:24 -0800 |
| commit | 23a62a87fd8de3b870131761204db6d095a76121 (patch) | |
| tree | 4547c0cf92363677c8507073995436892298b5bd /scripts/cmake | |
| parent | 6f398da24938ac65b4a1ccee70e7196e1b790730 (diff) | |
| parent | 751db7b568c3bb94084d033fd82e5b6dcd443825 (diff) | |
| download | vcpkg-23a62a87fd8de3b870131761204db6d095a76121.tar.gz vcpkg-23a62a87fd8de3b870131761204db6d095a76121.zip | |
Merge branch 'master' of https://github.com/Microsoft/vcpkg into dev/viromer/5058
Diffstat (limited to 'scripts/cmake')
| -rw-r--r-- | scripts/cmake/vcpkg_configure_cmake.cmake | 2 | ||||
| -rw-r--r-- | scripts/cmake/vcpkg_find_acquire_program.cmake | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake index 617fe1a0f..cf3fc7861 100644 --- a/scripts/cmake/vcpkg_configure_cmake.cmake +++ b/scripts/cmake/vcpkg_configure_cmake.cmake @@ -170,6 +170,8 @@ function(vcpkg_configure_cmake) list(APPEND _csc_OPTIONS "-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_ROOT_DIR}/scripts/toolchains/android.cmake") elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin") list(APPEND _csc_OPTIONS "-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_ROOT_DIR}/scripts/toolchains/osx.cmake") + elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") + list(APPEND _csc_OPTIONS "-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_ROOT_DIR}/scripts/toolchains/freebsd.cmake") endif() list(APPEND _csc_OPTIONS diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake index b6cfc4aab..0c3a9bca2 100644 --- a/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -123,6 +123,8 @@ function(vcpkg_find_acquire_program VAR) set(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") + set(PATHS "${DOWNLOADS}/tools/${SUBDIR}-freebsd") else() set(PATHS "${DOWNLOADS}/tools/${SUBDIR}-linux") endif() |