diff options
| author | Shauren <shauren.trinity@gmail.com> | 2022-06-17 18:04:02 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-06-17 18:04:02 +0200 |
| commit | 091e71502c58b824e1b04517907a2a449f3b168f (patch) | |
| tree | 9af544815c0d1bded97c9b267acbb6fdcd3f33be /cmake/macros | |
| parent | 758580c0760c799f2b870d2a898120eb6065dc42 (diff) | |
Build: Improve automatic finding of libraries on mac
Diffstat (limited to 'cmake/macros')
| -rw-r--r-- | cmake/macros/FindOpenSSL.cmake | 6 | ||||
| -rw-r--r-- | cmake/macros/FindReadline.cmake | 15 |
2 files changed, 17 insertions, 4 deletions
diff --git a/cmake/macros/FindOpenSSL.cmake b/cmake/macros/FindOpenSSL.cmake index dbb4eebd5e1..c94e0789738 100644 --- a/cmake/macros/FindOpenSSL.cmake +++ b/cmake/macros/FindOpenSSL.cmake @@ -168,6 +168,12 @@ else () ) endif () +if(HOMEBREW_PREFIX) + list(APPEND _OPENSSL_ROOT_HINTS + "${HOMEBREW_PREFIX}/opt/openssl@1.1" + "${HOMEBREW_PREFIX}/opt/openssl@3") +endif() + set(_OPENSSL_ROOT_HINTS_AND_PATHS HINTS ${_OPENSSL_ROOT_HINTS} PATHS ${_OPENSSL_ROOT_PATHS} diff --git a/cmake/macros/FindReadline.cmake b/cmake/macros/FindReadline.cmake index 3942a8ba8e5..81743b27073 100644 --- a/cmake/macros/FindReadline.cmake +++ b/cmake/macros/FindReadline.cmake @@ -45,12 +45,20 @@ Hints Set ``READLINE_ROOT_DIR`` to the root directory of Readline installation. #]=======================================================================] +set(_READLINE_ROOT_HINTS + ${READLINE_ROOT_DIR} + ENV READLINE_ROOT_DIR +) + +if(HOMEBREW_PREFIX) + list(APPEND _READLINE_ROOT_HINTS "${HOMEBREW_PREFIX}/opt/readline") +endif() + find_path(READLINE_INCLUDE_DIR NAMES readline/readline.h HINTS - ${READLINE_ROOT_DIR} - ENV READLINE_ROOT_DIR + ${_READLINE_ROOT_HINTS} PATH_SUFFIXES include) @@ -58,8 +66,7 @@ find_library(READLINE_LIBRARY NAMES readline HINTS - ${READLINE_ROOT_DIR} - ENV READLINE_ROOT_DIR + ${_READLINE_ROOT_HINTS} PATH_SUFFIXES lib) |