From 27149bb785f77f3ce878fc7759df9faf9e3ea6bc Mon Sep 17 00:00:00 2001 From: Paul Rosania Date: Tue, 3 Jul 2018 06:18:55 -0700 Subject: [folly] Fix fatal error in folly-config.cmake (#3747) facebook/folly@10d1edd8b3a01e49096e01647b2e04213c12faed 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. --- ports/folly/portfile.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake index 6a2b5b82d..52bd5764a 100644 --- a/ports/folly/portfile.cmake +++ b/ports/folly/portfile.cmake @@ -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) -- cgit v1.2.3