mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-28 06:17:50 +08:00
e6cabdece5
* start 2021-04-16 process Major new things: * update to macOS Big Sur (11.*) * switch from VirtualBox to Parallels due to ^ (and also ARM) Minor new things: * update from xcode CLT 12 to 12.4 This PR includes new stuff for creating the base box for parallels. Still to do: using the new box type. * update the vagrantfile stuff * link the CI to the new version * modify how macOS boxes are made the Vagrantfile for the final VM will only download the azure pipeline stuff this allows us to keep the versions of brew applications stable * fix cpus and memory * add vagrant plugins to installables * Skip cppgraphqlgen ICE. * [sdformat6] Remove unneeded include(FindBoost) which causes problems when the system cmake version doesn't match the one deployed by vcpkg. * switch to dmg for installing osxfuse/sshfs * Set cores to 11 (leaving 1 thread for host) Co-authored-by: Billy Robert ONeal III <bion@microsoft.com>
13 lines
331 B
Diff
13 lines
331 B
Diff
diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake
|
|
index c2a0ee4..2735a07 100644
|
|
--- a/cmake/SearchForStuff.cmake
|
|
+++ b/cmake/SearchForStuff.cmake
|
|
@@ -13,7 +13,6 @@ if (WIN32)
|
|
set(Boost_USE_STATIC_RUNTIME OFF)
|
|
endif()
|
|
|
|
-include(FindBoost)
|
|
find_package(Boost ${MIN_BOOST_VERSION})
|
|
|
|
if (NOT Boost_FOUND)
|