Enable using re-entrant qhull (refs #4040) #5033
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
|
00c1542 backported to 3.4 |
SpaceIm
reviewed
Jan 4, 2022
Comment on lines
+4680
to
+4708
| AC_CHECK_HEADERS([libqhull_r/libqhull_r.h]) | ||
| if test "$ac_cv_header_libqhull_r_libqhull_r_h" = "yes"; then | ||
| AC_CHECK_LIB(qhull_r,qh_new_qhull,QHULL_SETTING=yes,QHULL_SETTING=no,) | ||
| if test "$QHULL_SETTING" = "yes"; then | ||
| QHULL_SETTING=external | ||
| QHULL_INCLUDE_SUBDIR_IS_LIBQHULL=0 | ||
| LIBS="-lqhull $LIBS" | ||
| QHULL_IS_LIBQHULL_R=1 | ||
| LIBS="-lqhull_r $LIBS" | ||
| fi | ||
| fi | ||
| AC_CHECK_HEADERS([libqhull/libqhull.h]) | ||
| if test "$ac_cv_header_libqhull_libqhull_h" = "yes"; then | ||
| AC_CHECK_LIB(qhull,qh_new_qhull,QHULL_SETTING=yes,QHULL_SETTING=no,) | ||
| if test "$QHULL_SETTING" = "yes"; then | ||
| QHULL_SETTING=external | ||
| QHULL_INCLUDE_SUBDIR_IS_LIBQHULL=1 | ||
| LIBS="-lqhull $LIBS" | ||
| else | ||
| # Only qhull 2012 is reliable on certain datasets. Older Ubuntu have | ||
| # qhull/qhull.h | ||
| AC_CHECK_HEADERS([qhull/libqhull.h]) | ||
| if test "$ac_cv_header_qhull_libqhull_h" = "yes"; then | ||
| AC_CHECK_LIB(qhull,qh_new_qhull,QHULL_SETTING=yes,QHULL_SETTING=no,) | ||
| if test "$QHULL_SETTING" = "yes"; then | ||
| QHULL_SETTING=external | ||
| QHULL_INCLUDE_SUBDIR_IS_LIBQHULL=0 | ||
| LIBS="-lqhull $LIBS" | ||
| fi | ||
| fi | ||
|
|
||
| AC_CHECK_HEADERS([libqhull/libqhull.h]) | ||
| if test "$ac_cv_header_libqhull_libqhull_h" = "yes"; then | ||
| AC_CHECK_LIB(qhull,qh_new_qhull,QHULL_SETTING=yes,QHULL_SETTING=no,) | ||
| if test "$QHULL_SETTING" = "yes"; then | ||
| QHULL_SETTING=external | ||
| QHULL_INCLUDE_SUBDIR_IS_LIBQHULL=1 | ||
| LIBS="-lqhull $LIBS" | ||
| fi |
There was a problem hiding this comment.
It's fragile. qhull lib names are different for shared/static and release/debug (+ non-reentrant/reentrant). qhull provides pkg-config files, it would be more robust to rely on them.
qhull.pc => shared qhull non-reentrant
qhullstatic.pc => static qhull non-reentrant
qhull_r.pc => static qhull reentrant
qhullstatic_r.pc => static qhull reentrant
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.
No description provided.