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

fixed cmake setup when tests are disabled #1319

Merged
merged 1 commit into from
Dec 29, 2020

Conversation

debaetsd
Copy link
Contributor

Description

This PR fixes cmake setup when tests are explicitly disabled ( -DOSL_BUILD_TESTS=0 on cmake cmd line).
The (recently introduced) testing cmake file is only included when that option is enabled yet adding the tests themselves is not checked (and so cmake does not know osl_add_all_tests).

Tests

tested local with/without changes (with these changes it works as expected)

Checklist:

  • I have read the contribution guidelines.
  • I have previously submitted a Contributor License Agreement.
  • I have updated the documentation, if applicable.
  • I have ensured that the change is tested somewhere in the testsuite (adding new test cases if necessary).
  • My code follows the prevailing code style of this project.

Copy link
Collaborator

@lgritz lgritz left a comment

Choose a reason for hiding this comment

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

LGTM!

@lgritz lgritz merged commit 14bd942 into AcademySoftwareFoundation:master Dec 29, 2020
@debaetsd debaetsd deleted the cmake_testfix branch December 29, 2020 21:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants