diff options
| author | Ryan Saunders <saunders@aggienetwork.com> | 2019-04-10 23:07:17 -0700 |
|---|---|---|
| committer | Ryan Saunders <saunders@aggienetwork.com> | 2019-04-10 23:07:17 -0700 |
| commit | a492caf9d5a069987b6309c6cbf8e5cc8c3ec6a8 (patch) | |
| tree | 11f6f1c5e3f4caa03f297162ffab9f79941f676c /scripts/buildsystems | |
| parent | 80965287d1483f98f49ba83e026f022369798990 (diff) | |
| parent | b625cbf82f792409fa59262546cb5ed1ef7944e3 (diff) | |
| download | vcpkg-a492caf9d5a069987b6309c6cbf8e5cc8c3ec6a8.tar.gz vcpkg-a492caf9d5a069987b6309c6cbf8e5cc8c3ec6a8.zip | |
Merge branch 'master' into query_deps
Diffstat (limited to 'scripts/buildsystems')
| -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}) |