diff options
| author | Damian Jarek <damian.jarek93@gmail.com> | 2019-04-05 04:13:10 +0200 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2019-04-04 19:13:10 -0700 |
| commit | 0e4c999b21c0ba09eb21fea2722f97c9a6c2ac50 (patch) | |
| tree | 1d8de58b02f658f5cbf3e9c1cdb051ca64725e89 /scripts | |
| parent | e33ffb6f905fb6c7446003ce15028bc1f5606cf7 (diff) | |
| download | vcpkg-0e4c999b21c0ba09eb21fea2722f97c9a6c2ac50.tar.gz vcpkg-0e4c999b21c0ba09eb21fea2722f97c9a6c2ac50.zip | |
Fix installation failure when system Boost present (#5939)
Boost 1.70 introduces "native" cmake config scripts which are
accidentally used when installing a vcpkg package. This only occurs
when Boost 1.70 is installed in the system when the user uses
`vcpkg install`.
Signed-off-by: Damian Jarek <damian.jarek93@gmail.com>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/buildsystems/vcpkg.cmake | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index b8037f466..b2a589421 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -192,6 +192,7 @@ macro(find_package name) set(Boost_USE_STATIC_LIBS OFF) set(Boost_USE_MULTITHREADED ON) unset(Boost_USE_STATIC_RUNTIME) + set(Boost_NO_BOOST_CMAKE ON) unset(Boost_USE_STATIC_RUNTIME CACHE) set(Boost_COMPILER "-vc140") _find_package(${ARGV}) |