diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-11-06 09:49:13 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-06 09:49:13 -0800 |
| commit | 5743b68bc25d0ef72779bce8c1a1ea8f6c8448c5 (patch) | |
| tree | f9278d4a6d42e663fd78cd7acc69f7ed77041c58 /scripts | |
| parent | 771d29df25b568f7ff21344b2f9bb3fb9080b77a (diff) | |
| parent | 07e4e674f09e435ba2a444296bbc12814cc8428e (diff) | |
| download | vcpkg-5743b68bc25d0ef72779bce8c1a1ea8f6c8448c5.tar.gz vcpkg-5743b68bc25d0ef72779bce8c1a1ea8f6c8448c5.zip | |
Merge pull request #2139 from UnaNancyOwen/fix_buildsystems
Reset settings to find boost libraries
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/buildsystems/vcpkg.cmake | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index 19fc99af7..68e29b87c 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -155,6 +155,8 @@ endfunction() macro(find_package name) if(name STREQUAL "Boost") unset(Boost_USE_STATIC_LIBS) + unset(Boost_USE_MULTITHREADED) + unset(Boost_USE_STATIC_RUNTIME) endif() _find_package(${ARGV}) endmacro() |