Commit d6643d46 authored by Marius Rackwitz's avatar Marius Rackwitz

[Xcconfig] Introduce the user-defined setting PODS_FRAMEWORK_BUILD_PATH

Make CONFIGURATION_BUILD_DIR and FRAMEWORK_SEARCH_PATHS depend on this instead of double set the value to this constant.
parent 50bdca2a
......@@ -59,7 +59,8 @@ module Pod
if target.requires_framework?
build_settings = {
'FRAMEWORK_SEARCH_PATHS' => XCConfigHelper.quote([target.configuration_build_dir]),
'PODS_FRAMEWORK_BUILD_PATH' => target.configuration_build_dir,
'FRAMEWORK_SEARCH_PATHS' => '"$PODS_FRAMEWORK_BUILD_PATH"',
}
config.merge!(build_settings)
end
......
......@@ -60,8 +60,9 @@ module Pod
if target.requires_framework?
dependencies = target.module_dependencies.reject { |dep| dep == target.product_module_name }
build_settings = {
'CONFIGURATION_BUILD_DIR' => target.configuration_build_dir,
'FRAMEWORK_SEARCH_PATHS' => XCConfigHelper.quote([target.configuration_build_dir]),
'PODS_FRAMEWORK_BUILD_PATH' => target.configuration_build_dir,
'CONFIGURATION_BUILD_DIR' => '$PODS_FRAMEWORK_BUILD_PATH',
'FRAMEWORK_SEARCH_PATHS' => '"$PODS_FRAMEWORK_BUILD_PATH"',
'OTHER_LDFLAGS' => '$(inherited) ' + XCConfigHelper.quote(dependencies, '-framework')
}
config.merge!(build_settings)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment