mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-24 20:46:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[folly] Fix fatal error in folly-config.cmake (#3747)

Browse Source 
facebook/folly@10d1edd8b3 makes two
simultaneous changes:
1. It uses a different mechanism for setting `FOLLY_CMAKE_DIR`, which
   confuses `vcpkg_fixup_cmake_targets` so the path isn't rewritten.
2. It introduces `set_and_check` validation on `FOLLY_CMAKE_DIR`, which
   causes a fatal cmake error if the path is missing.

The combination of these two changes is that folly-config.cmake produces
a fatal error when executed.

This PR tweaks folly's build params and the `vcpkg_fixup_cmake_targets`
arguments so things are rewritten correctly and everything works again.
This commit is contained in:
Paul Rosania 2018-07-03 06:18:55 -07:00 committed by Robert Schumacher
parent 90bef5f6ed
commit 27149bb785
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ports/folly/portfile.cmake
View File

@ -66,6 +66,7 @@ vcpkg_configure_cmake(
-DLIBAIO_FOUND=OFF
-DLIBURCU_FOUND=OFF
-DCMAKE_DISABLE_FIND_PACKAGE_LibURCU=ON
-DCMAKE_INSTALL_DIR=share/folly
${FEATURE_OPTIONS}
)
@ -73,7 +74,7 @@ vcpkg_install_cmake(ADD_BIN_TO_PATH)
vcpkg_copy_pdbs()
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/folly)
vcpkg_fixup_cmake_targets(CONFIG_PATH share/folly)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)