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

gh-action: Adapt unittests to renamed CMake flags, fix using external gtest. #89

Merged
merged 2 commits into from
Jun 22, 2022

Conversation

olifre
Copy link
Contributor

@olifre olifre commented Jun 22, 2022

This adapts the unit tests (in GitHub actions) to use the now prefixed CMake flags, changed as part of #84 .
Thanks for the very welcome change 👍 .

@olifre
Copy link
Contributor Author

olifre commented Jun 22, 2022

Now that the unit tests are adapted and actually test using external gtest once more, it seems that SCITOKENS_EXTERNAL_GTEST=YES is actually not working anymore.
Will investigate later.

@olifre olifre changed the title gh-action: Adapt unittests to renamed CMake flags. gh-action: Adapt unittests to renamed CMake flags, fix using external gtest. Jun 22, 2022
@olifre
Copy link
Contributor Author

olifre commented Jun 22, 2022

The second commit I pushed just now fixes support for usage of external gtest.

Copy link
Contributor

@djw8605 djw8605 left a comment

Choose a reason for hiding this comment

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

LGTM

@djw8605 djw8605 merged commit 1613eb2 into scitokens:master Jun 22, 2022
add_dependencies(scitokens-gtest gtest)
if( NOT SCITOKENS_EXTERNAL_GTEST )
add_dependencies(scitokens-gtest gtest)
endif()
include_directories("${PROJECT_SOURCE_DIR}/vendor/gtest/googletest/include")
Copy link
Contributor

Choose a reason for hiding this comment

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

Also this line (include_directories ...) should be inside the if ( NOT SCITOKENS_EXTERNAL_GTEST ).

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.

3 participants