diff --git a/cmake/modules/ExternalLibraryHelper.cmake b/cmake/modules/ExternalLibraryHelper.cmake --- a/cmake/modules/ExternalLibraryHelper.cmake +++ b/cmake/modules/ExternalLibraryHelper.cmake @@ -19,7 +19,7 @@ NAMES ${ARG_NAMES} PATHS "" ${ARG_PATHS} HINTS "" ${ARG_HINTS} - PATH_SUFFIXES "" ${ARG_PATH_SUFFIXES} + PATH_SUFFIXES "lib" ${ARG_PATH_SUFFIXES} ) mark_as_advanced(${LIB}_${COMPONENT}_LIBRARY) diff --git a/cmake/modules/FindBerkeleyDB.cmake b/cmake/modules/FindBerkeleyDB.cmake --- a/cmake/modules/FindBerkeleyDB.cmake +++ b/cmake/modules/FindBerkeleyDB.cmake @@ -47,7 +47,7 @@ endfunction() include(BrewHelper) -find_brew_prefix(BREW_HINT berkeley-db) +find_brew_prefix(_BerkeleyDB_BREW_HINT berkeley-db) # If the include directory is user supplied, skip the search if(NOT BerkeleyDB_INCLUDE_DIR) @@ -59,6 +59,7 @@ generate_versions_variants(_BerkeleyDB_PATH_SUFFIXES_18_1 db 18 1) set(_BerkeleyDB_PATH_SUFFIXES + include ${_BerkeleyDB_PATH_SUFFIXES_5_3} ${_BerkeleyDB_PATH_SUFFIXES_6_2} ${_BerkeleyDB_PATH_SUFFIXES_18_1} @@ -70,7 +71,7 @@ # the `BerkeleyDB_ROOT` variable to cmake. find_path(BerkeleyDB_INCLUDE_DIR NAMES db.h - HINTS ${BREW_HINT} + HINTS ${_BerkeleyDB_BREW_HINT} PATH_SUFFIXES ${_BerkeleyDB_PATH_SUFFIXES} ) endif() @@ -137,7 +138,7 @@ find_component(BerkeleyDB C NAMES ${_db_variants} - HINTS ${BREW_HINT} + HINTS ${_BerkeleyDB_BREW_HINT} PATH_SUFFIXES ${_db_variants} INCLUDE_DIRS ${BerkeleyDB_INCLUDE_DIRS} ) @@ -151,7 +152,7 @@ find_component(BerkeleyDB CXX NAMES ${_db_cxx_variants} - HINTS ${BREW_HINT} + HINTS ${_BerkeleyDB_BREW_HINT} PATH_SUFFIXES ${_db_variants} INCLUDE_DIRS ${BerkeleyDB_INCLUDE_DIRS} ) diff --git a/cmake/modules/FindEvent.cmake b/cmake/modules/FindEvent.cmake --- a/cmake/modules/FindEvent.cmake +++ b/cmake/modules/FindEvent.cmake @@ -27,12 +27,13 @@ pkg_check_modules(PC_Event QUIET libevent) include(BrewHelper) -find_brew_prefix(BREW_HINT berkeley-db) +find_brew_prefix(_Event_BREW_HINT libevent) find_path(Event_INCLUDE_DIR NAMES event.h PATHS ${PC_Event_INCLUDE_DIRS} - HINTS ${BREW_HINT} + HINTS ${_Event_BREW_HINT} + PATH_SUFFIXES include ) set(Event_INCLUDE_DIRS ${Event_INCLUDE_DIR}) @@ -43,7 +44,7 @@ find_component(Event event NAMES event - HINTS "${BREW_HINT}" + HINTS "${_Event_BREW_HINT}" INCLUDE_DIRS ${Event_INCLUDE_DIRS} PATHS ${PC_Event_LIBRARY_DIRS} INTERFACE_LINK_LIBRARIES "$<$:ws2_32;shell32;advapi32>" diff --git a/cmake/modules/FindGMP.cmake b/cmake/modules/FindGMP.cmake --- a/cmake/modules/FindGMP.cmake +++ b/cmake/modules/FindGMP.cmake @@ -25,11 +25,12 @@ # GMP::gmp include(BrewHelper) -find_brew_prefix(BREW_HINT gmp) +find_brew_prefix(_GMP_BREW_HINT gmp) find_path(GMP_INCLUDE_DIR NAMES gmp.h - HINTS ${BREW_HINT} + HINTS ${_GMP_BREW_HINT} + PATH_SUFFIXES include ) set(GMP_INCLUDE_DIRS "${GMP_INCLUDE_DIR}") mark_as_advanced(GMP_INCLUDE_DIR) @@ -78,7 +79,7 @@ include(ExternalLibraryHelper) find_component(GMP gmp NAMES gmp - HINTS ${BREW_HINT} + HINTS ${_GMP_BREW_HINT} INCLUDE_DIRS ${GMP_INCLUDE_DIRS} ) endif() diff --git a/cmake/modules/FindJemalloc.cmake b/cmake/modules/FindJemalloc.cmake --- a/cmake/modules/FindJemalloc.cmake +++ b/cmake/modules/FindJemalloc.cmake @@ -23,13 +23,13 @@ pkg_check_modules(PC_Jemalloc QUIET libjemalloc) include(BrewHelper) -find_brew_prefix(BREW_HINT jemalloc) +find_brew_prefix(_Jemalloc_BREW_HINT jemalloc) find_path(Jemalloc_INCLUDE_DIR NAMES jemalloc.h PATHS ${PC_Jemalloc_INCLUDE_DIRS} - PATH_SUFFIXES jemalloc - HINTS ${BREW_HINT} + PATH_SUFFIXES include jemalloc + HINTS ${_Jemalloc_BREW_HINT} ) set(Jemalloc_INCLUDE_DIRS ${Jemalloc_INCLUDE_DIR}) @@ -66,7 +66,7 @@ find_component(Jemalloc jemalloc NAMES jemalloc_pic jemalloc - HINTS "${BREW_HINT}" + HINTS "${_Jemalloc_BREW_HINT}" INCLUDE_DIRS ${Jemalloc_INCLUDE_DIRS} PATHS ${PC_Jemalloc_LIBRARY_DIRS} INTERFACE_LINK_LIBRARIES "$<$>:m>" Threads::Threads diff --git a/cmake/modules/FindMiniUPnPc.cmake b/cmake/modules/FindMiniUPnPc.cmake --- a/cmake/modules/FindMiniUPnPc.cmake +++ b/cmake/modules/FindMiniUPnPc.cmake @@ -22,16 +22,16 @@ # MiniUPnPc::miniupnpc include(BrewHelper) -find_brew_prefix(BREW_HINT miniupnpc) +find_brew_prefix(_MiniUPnPc_BREW_HINT miniupnpc) find_package(PkgConfig) pkg_check_modules(PC_MiniUPnPc QUIET libqrencode) find_path(MiniUPnPc_INCLUDE_DIR NAMES miniupnpc.h - HINTS ${BREW_HINT} + HINTS ${_MiniUPnPc_BREW_HINT} PATHS ${PC_MiniUPnPc_INCLUDE_DIRS} - PATH_SUFFIXES miniupnpc + PATH_SUFFIXES include miniupnpc ) set(MiniUPnPc_INCLUDE_DIRS "${MiniUPnPc_INCLUDE_DIR}") @@ -58,7 +58,7 @@ include(ExternalLibraryHelper) find_component(MiniUPnPc miniupnpc NAMES miniupnpc - HINTS ${BREW_HINT} + HINTS ${_MiniUPnPc_BREW_HINT} PATHS ${PC_MiniUPnPc_LIBRARY_DIRS} PATH_SUFFIXES miniupnpc INCLUDE_DIRS ${MiniUPnPc_INCLUDE_DIRS} diff --git a/cmake/modules/FindQREncode.cmake b/cmake/modules/FindQREncode.cmake --- a/cmake/modules/FindQREncode.cmake +++ b/cmake/modules/FindQREncode.cmake @@ -21,15 +21,16 @@ # QREncode::qrencode include(BrewHelper) -find_brew_prefix(BREW_HINT qrencode) +find_brew_prefix(_QREncode_BREW_HINT qrencode) find_package(PkgConfig) pkg_check_modules(PC_QREncode QUIET libqrencode) find_path(QREncode_INCLUDE_DIR NAMES qrencode.h - HINTS ${BREW_HINT} + HINTS ${_QREncode_BREW_HINT} PATHS ${PC_QREncode_INCLUDE_DIRS} + PATH_SUFFIXES include ) set(QREncode_INCLUDE_DIRS "${QREncode_INCLUDE_DIR}") @@ -42,7 +43,7 @@ include(ExternalLibraryHelper) find_component(QREncode qrencode NAMES qrencode - HINTS ${BREW_HINT} + HINTS ${_QREncode_BREW_HINT} PATHS ${PC_QREncode_LIBRARY_DIRS} INCLUDE_DIRS ${QREncode_INCLUDE_DIRS} )