From 0058b52cbf1b5e4d9ea4c0472ac4302c9f62c36f Mon Sep 17 00:00:00 2001 From: Marc Rousavy Date: Wed, 13 Oct 2021 15:18:11 +0200 Subject: [PATCH] fix: Fix "Folly" include (#273) * fix: Fix "folly" header not found by including the header search path * cleanup --- VisionCamera.podspec | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/VisionCamera.podspec b/VisionCamera.podspec index 8cfe1c6..3f588c3 100644 --- a/VisionCamera.podspec +++ b/VisionCamera.podspec @@ -2,6 +2,19 @@ require "json" package = JSON.parse(File.read(File.join(__dir__, "package.json"))) +reactVersion = '0.0.0' +begin + reactVersion = JSON.parse(File.read(File.join(__dir__, "..", "react-native", "package.json")))["version"] +rescue + reactVersion = '0.66.0' +end +rnVersion = reactVersion.split('.')[1] + +folly_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -DRNVERSION=' + rnVersion +folly_compiler_flags = folly_flags + ' ' + '-Wno-comma -Wno-shorten-64-to-32' +folly_version = '2021.04.26.00' +boost_compiler_flags = '-Wno-documentation' + Pod::Spec.new do |s| s.name = "VisionCamera" s.version = package["version"] @@ -14,10 +27,16 @@ Pod::Spec.new do |s| s.source = { :git => "https://github.com/mrousavy/react-native-vision-camera.git", :tag => "#{s.version}" } s.pod_target_xcconfig = { - "DEFINES_MODULE" => "YES", "USE_HEADERMAP" => "YES", - "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_TARGET_SRCROOT)\" \"$(PODS_ROOT)/Headers/Private/React-Core\" \"$(PODS_ROOT)/Headers/Public/React-hermes\" \"$(PODS_ROOT)/Headers/Public/hermes-engine\"" + "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_TARGET_SRCROOT)\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/Headers/Private/React-Core\" " } + s.compiler_flags = folly_compiler_flags + ' ' + boost_compiler_flags + s.xcconfig = { + "CLANG_CXX_LANGUAGE_STANDARD" => "c++14", + "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/glog\" \"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-hermes\" \"${PODS_ROOT}/Headers/Public/hermes-engine\"", + "OTHER_CFLAGS" => "$(inherited)" + " " + folly_flags + } + s.requires_arc = true # All source files that should be publicly visible