From 70e7c3e12fccd68fd8f7b34bfc17fbe681c7cb32 Mon Sep 17 00:00:00 2001 From: Tom Haines Date: Fri, 3 Jan 2020 05:44:54 +0800 Subject: [PATCH] [fruit] fix wchar.h import issue under Catalina (#9445) * Issue 9444 fix wchar.h import issue under Catalina * 9445 apply suggestions from review --- ports/fruit/CONTROL | 4 ++-- ports/fruit/portfile.cmake | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ports/fruit/CONTROL b/ports/fruit/CONTROL index 4e7bd9f8dc..8d3e9dce40 100644 --- a/ports/fruit/CONTROL +++ b/ports/fruit/CONTROL @@ -1,4 +1,4 @@ Source: fruit -Version: 3.4.0-1 +Version: 3.4.0-2 +Homepage: https://github.com/google/fruit Description: Fruit, a dependency injection framework for C++ by Google - diff --git a/ports/fruit/portfile.cmake b/ports/fruit/portfile.cmake index a945e63bdd..f47d228027 100644 --- a/ports/fruit/portfile.cmake +++ b/ports/fruit/portfile.cmake @@ -1,4 +1,4 @@ -include(vcpkg_common_functions) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/fruit @@ -13,10 +13,11 @@ vcpkg_configure_cmake( PREFER_NINJA OPTIONS -DFRUIT_USES_BOOST=False + -DFRUIT_TESTS_USE_PRECOMPILED_HEADERS=OFF ) vcpkg_install_cmake() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) # Handle copyright -configure_file(${SOURCE_PATH}/COPYING ${CURRENT_PACKAGES_DIR}/share/fruit/copyright COPYONLY) +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)