Skip to content

Exporter - progen include dirs fix #1582

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 3, 2016
Merged

Exporter - progen include dirs fix #1582

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion workspace_tools/export/exporters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ def progen_get_project_data(self):
self.resources.objects + self.resources.libraries,
},
'includes': {
'Include Files': self.resources.headers + self.resources.inc_dirs,
'Include Files': self.resources.headers,
},
'target': [TARGET_MAP[self.target].progen['target']],
'macros': self.get_symbols(),
Expand All @@ -76,6 +76,9 @@ def progen_gen_file(self, tool_name, project_data):
"""" Generate project using ProGen Project API """
settings = ProjectSettings()
project = Project(self.program_name, [project_data], settings)
# TODO: Fix this, the inc_dirs are not valid (our scripts copy files), therefore progen
# thinks it is not dict but a file, and adds them to workspace.
project.project['common']['include_paths'] = self.resources.inc_dirs
project.generate(tool_name, copied=True)

def __scan_all(self, path):
Expand Down