find_package(Threads) regardless of BUILD_ONLY_LIB #1653
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
zxjtan
force-pushed
the
main
branch
4 times, most recently
from
3e19c2d to
6a0aa38
Compare
|
@zxjtan Sorry it's taken so long for us to provide feedback on this PR! It looks reasonable to me (pending a rebase on the latest |
dstebila
approved these changes
Jan 30, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Retroactive follow-up to #1576: I realised that #1549 introduces usage of pthreads into the main library code. I also infer that the reason
find_package(Threads)was originally gated behindOQS BUILD_ONLY_LIBwas because only test code used pthreads. Hence, CMake should now always look for the Threads package (on non-MSVC compilers).Just doing the above breaks Zephyr builds. Hence, this PR also adds a new CMake variable
OQS_USE_PTHREADSthat will betrueif (CMAKE_USE_PTHREADS_INIT AND NOT OQS_EMBEDDED_BUILD). It also changes code gated on#CMAKE_USE_PTHREADS_INITmacro to gate on#OQS_USE_PTHREADSinstead.