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 the new code optional #11

Merged
merged 9 commits into from Sep 14, 2022
Merged

Conversation

greglandrum
Copy link
Collaborator

@greglandrum greglandrum commented Sep 14, 2022

This adds a cmake configuration option for the new code so that building it is optional. I want to do this so that we don't add a mandatory dependency on the YAeHMOP code.
It also merges on the most recent status of master

DavidACosgrove and others added 8 commits September 12, 2022 04:23
* Fixed drawing of O in aldehydes.

* Added DrawColour::operator!=.

* Remove unused variable.

* Export doLinesIntersect for test.

Co-authored-by: David Cosgrove <david@cozchemix.co.uk>
Co-authored-by: Greg Landrum <greg.landrum@gmail.com>
* Make ACS mode work properly in fixed size drawers.

* Extra comment.

* Update hash codes.

* Export doLinesIntersect.

Co-authored-by: David Cosgrove <david@cozchemix.co.uk>
Co-authored-by: Greg Landrum <greg.landrum@gmail.com>
…rdkit#5550)

* Fixes rdkit#5505

* Switch to using hasBondTypeQuery()

* update the docs

* ensure we still fail with non-ring aromatic atoms

* changes in response to review
* Fix crash in brackets extraction.

* Add hashcode, tidy.

* Remove unused variable.

Co-authored-by: David Cosgrove <david@cozchemix.co.uk>
Co-authored-by: Greg Landrum <greg.landrum@gmail.com>
* switch to basic cmake from external project
the external project stuff in cmake is overly opaque

* enable yaehmop builds in CI

* disable building of the yaehmop binary

* Update External/YAeHMOP/CMakeLists.txt

Co-authored-by: Ric <ricrogz@users.noreply.github.com>

Co-authored-by: Ric <ricrogz@users.noreply.github.com>
Copy link
Owner

@gosreya gosreya left a comment

Choose a reason for hiding this comment

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

Found a small typo

CMakeLists.txt Outdated Show resolved Hide resolved
Co-authored-by: Sreya Gogineni <74024376+gosreya@users.noreply.github.com>
@greglandrum
Copy link
Collaborator Author

Found a small typo

Good catch. It's fixed.

@gosreya gosreya merged commit 6c037d9 into gosreya:gsoc2022 Sep 14, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants