aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormanuroe <manu@matrix.org>2016-11-03 17:33:31 +0100
committermanuroe <manu@matrix.org>2016-11-03 17:33:31 +0100
commit34998b52c79661d79efe3a12100fad9ce2d5fae6 (patch)
tree4d1ce91c8936a1da72173cccd498247fcdea87e0
parenta9be04fa4b53e7012406a9a89596e94b65947c20 (diff)
OLMKit: Attempt to make podspec work when the pod is downloaded from git
-rw-r--r--OLMKit.podspec5
1 files changed, 4 insertions, 1 deletions
diff --git a/OLMKit.podspec b/OLMKit.podspec
index a27d0f7..c4ba16d 100644
--- a/OLMKit.podspec
+++ b/OLMKit.podspec
@@ -38,8 +38,11 @@ Pod::Spec.new do |s|
# Use the same compiler options for C and C++ as olm/Makefile
s.compiler_flags = "-g -O3 -DOLMLIB_VERSION_MAJOR=#{MAJOR} -DOLMLIB_VERSION_MINOR=#{MINOR} -DOLMLIB_VERSION_PATCH=#{PATCH}"
+
+ # For headers search paths, manage first the normal installation. Then, use paths used
+ # when the pod is local
s.xcconfig = {
- 'USER_HEADER_SEARCH_PATHS' =>"#{File.join(File.dirname(__FILE__), 'include')} #{File.join(File.dirname(__FILE__), 'lib')}"
+ 'USER_HEADER_SEARCH_PATHS' =>"${PODS_ROOT}/OLMKit/include ${PODS_ROOT}/OLMKit/lib #{File.join(File.dirname(__FILE__), 'include')} #{File.join(File.dirname(__FILE__), 'lib')}"
}
s.subspec 'olmc' do |olmc|