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.

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

Add boost_submod to tool directory scripts. #88

Merged
merged 1 commit into from
Nov 19, 2019

Conversation

roccomoretti
Copy link
Member

To support full testing of RosettaCommons/main#4360, we need to have support/changes in the tools repo (for tests like the header only and serialization code quality tests, which use scripts in the tools directory which hard code the compiler include paths.)

To support both current master and the new submodule approach, I've added the boost_submod directory to the compilation command line in addition the the old boost_1_55_0 one. That should hopefully work for both versions, as nonexistant include directories should be ignored. (We can remove the old directory if/when we officially merge the submodule approach.)

This is temporary, will remove the old 1_55 version if we merge, but they should be able to coexist for now.
Copy link
Member

@lyskov lyskov left a comment

Choose a reason for hiding this comment

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

Looks good to me Rocco! I am not sure if you want it but alternatively we use this PR https://github.com/RosettaCommons/main/pull/4231 and make this changes in-sync (but that will probably delay Boost upgrade PR merging so i am not sure if you want to that)

@roccomoretti
Copy link
Member Author

Yeah, I thought of that, but I didn't want to couple the boost submodule change with the submodularizing tools change.

@roccomoretti roccomoretti merged commit 16534f8 into master Nov 19, 2019
@roccomoretti roccomoretti deleted the roccomoretti/boost_submod branch November 19, 2019 20:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants