Skip to content

Split conan resolve by native_external_library targets (takeover). - #6630

Merged
cosmicexplorer merged 3 commits into
pantsbuild:masterfrom
cosmicexplorer:stuhood/split-native-external-libraries-by-target
Oct 15, 2018
Merged

Split conan resolve by native_external_library targets (takeover).#6630
cosmicexplorer merged 3 commits into
pantsbuild:masterfrom
cosmicexplorer:stuhood/split-native-external-libraries-by-target

Conversation

@cosmicexplorer

@cosmicexplorer cosmicexplorer commented Oct 14, 2018

Copy link
Copy Markdown
Contributor

Takeover of #6492 (which has completely passed review) as it was blocked by progress on two other PRs I have up (#6486, #6628) due to potential merge conflicts, which I can resolve when they come up for each of these PRs to unblock landing them in parallel.

@stuhood stuhood left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks.

include_dirs = [self._include_dirs_for_target(dep_tgt) for dep_tgt in dependencies]
include_dirs.extend(self._get_third_party_include_dirs(external_libs_product))
include_dirs.extend(self._get_third_party_include_dirs(external_libs_product, dependencies))
print('>>> include_dirs: {}'.format(include_dirs))

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

xx

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed!

@cosmicexplorer
cosmicexplorer merged commit f679089 into pantsbuild:master Oct 15, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants