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

Make EnergyPlus suitable as a cmake subproject #7825

Merged
merged 5 commits into from
Mar 2, 2020
Merged

Conversation

Myoldmopar
Copy link
Member

Pull request overview
#7616 Recreated to see if CI is happier now. Also pulled develop in and resolved conflicts.

@Myoldmopar
Copy link
Member Author

@kbenne I am not sure why CI was having trouble with your version of this. I pulled your branch, merged in develop, and it was happy right away. If it's all the same to you I'll just merge this in and call it good.

Anyone have any objections to this? It seems like a trivial beneficial change.

@Myoldmopar Myoldmopar added the Refactoring Includes code changes that don't change the functionality of the program, just perform refactoring label Mar 1, 2020
@Myoldmopar
Copy link
Member Author

Yay! @kbenne CI finally responded on all platforms to your changes, but in this branch. Maybe @nrel-bot-3 is mad at you for kicking him out of your basement?

Anyway, this looks good. I'm going to merge develop locally and make sure everything is good and then this can merge.

@Myoldmopar
Copy link
Member Author

Built locally with develop pulled in, ran unit tests, CI is happy on all platforms, can't ask for much more with this type of change. All is well. Merging. Hopefully this makes @kbenne and many other people have a much happier experience using EnergyPlus "as a project".

@Myoldmopar Myoldmopar merged commit fe24688 into develop Mar 2, 2020
@Myoldmopar Myoldmopar deleted the 7613-tryagain branch March 2, 2020 22:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Refactoring Includes code changes that don't change the functionality of the program, just perform refactoring
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants