Skip to content
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

Jump to bottom

feat: added basic preprocess table configuration #715

Merged
merged 13 commits into from
Jul 11, 2022
Merged

feat: added basic preprocess table configuration #715

merged 13 commits into from
Jul 11, 2022

Conversation

arteevraina
Copy link
Member

@arteevraina arteevraina commented Jun 26, 2022 •
edited
Loading

  • This PR adds the preprocess table configuration.
  • Add a compiler flag when [preprocess.cpp] is found in manifest file.

@milancurcic
Copy link
Member

Thanks, @arteevraina. Include in this PR also a minimal example package in [https://github.com/fortran-lang/fpm/tree/main/example_packages], e.g. preprocess_cpp or similar, that will be used for testing.

@arteevraina
Copy link
Member Author

@milancurcic Sure.

@arteevraina arteevraina marked this pull request as ready for review July 2, 2022 11:02
@arteevraina
Copy link
Member Author

@milancurcic I have added the ability to add cpp flag and also added the test cases in this PR.
Will open a new PR for docs when this gets merged. Let me know if any changes are required in this PR.

milancurcic
milancurcic approved these changes Jul 3, 2022
View reviewed changes
Copy link
Member

@milancurcic milancurcic left a comment

Choose a reason for hiding this comment

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

Thanks, @arteevraina!

example_packages/preprocess_cpp/src/preprocess_cpp.f90 Outdated Show resolved Hide resolved
src/fpm/manifest/preprocess.f90 Show resolved Hide resolved
src/fpm_compiler.f90 Outdated Show resolved Hide resolved
@milancurcic milancurcic requested a review from a team July 3, 2022 14:24
jvdp1
jvdp1 reviewed Jul 4, 2022
View reviewed changes
Copy link
Member

@jvdp1 jvdp1 left a comment

Choose a reason for hiding this comment

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

Nice work.
I have a general question. It seems that it is assumed that the CPP preprocessor is always provided by the compiler. Is it the case for all available compilers?

src/fpm/manifest/preprocess.f90 Show resolved Hide resolved
src/fpm_compiler.f90 Outdated Show resolved Hide resolved
@arteevraina
Copy link
Member Author

arteevraina commented Jul 7, 2022 •
edited
Loading

@jvdp1 I have added the logic to modify cpp preprocessor flag here.

zoziha
zoziha approved these changes Jul 7, 2022
View reviewed changes
src/fpm_compiler.f90 Outdated Show resolved Hide resolved
jvdp1
jvdp1 approved these changes Jul 7, 2022
View reviewed changes
Copy link
Member

@jvdp1 jvdp1 left a comment

Choose a reason for hiding this comment

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

Pending remaining comments, it looks good to me!

@arteevraina
Copy link
Member Author

@milancurcic Can we merge this one? If there are no more changes left to be done on this one?

@milancurcic
Copy link
Member

Yes, I think so, let's move forward. Thanks @arteevraina for the PR and everybody else for the reviews.

@milancurcic milancurcic merged commit 408e96a into fortran-lang:main Jul 11, 2022
@arteevraina arteevraina deleted the preprocess-table branch July 11, 2022 11:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@certik certik certik left review comments

@zoziha zoziha zoziha approved these changes

@milancurcic milancurcic milancurcic approved these changes

@jvdp1 jvdp1 jvdp1 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@arteevraina @milancurcic @certik @jvdp1 @zoziha