diff --git a/cmake/modules/FindEvent.cmake b/cmake/modules/FindEvent.cmake --- a/cmake/modules/FindEvent.cmake +++ b/cmake/modules/FindEvent.cmake @@ -59,7 +59,7 @@ if(NOT Event_VERSION) # If pkgconfig found a version number, use it. - if(PC_Event_VERSION) + if(PC_Event_VERSION AND (Event_INCLUDE_DIR STREQUAL PC_Event_INCLUDEDIR)) set(_Event_VERSION ${PC_Event_VERSION}) elseif(NOT CMAKE_CROSSCOMPILING) try_run(_Event_CheckVersion_RESULT _Event_CheckVersion_BUILD diff --git a/cmake/modules/FindJemalloc.cmake b/cmake/modules/FindJemalloc.cmake --- a/cmake/modules/FindJemalloc.cmake +++ b/cmake/modules/FindJemalloc.cmake @@ -27,7 +27,7 @@ find_path(Jemalloc_INCLUDE_DIR NAMES jemalloc.h - PATHS ${PC_Jemalloc_INCLUDE_DIRS} + PATHS ${Jemalloc_INCLUDE_DIR} PATH_SUFFIXES include jemalloc HINTS ${_Jemalloc_BREW_HINT} ) @@ -38,7 +38,7 @@ if(Jemalloc_INCLUDE_DIR) if(NOT Jemalloc_VERSION) # If pkgconfig found a version number, use it. - if(PC_Jemalloc_VERSION) + if(PC_Jemalloc_VERSION AND (Jemalloc_INCLUDE_DIR STREQUAL PC_Jemalloc_INCLUDEDIR)) set(_Jemalloc_VERSION ${PC_Jemalloc_VERSION}) else() # Read the version from file db.h into a variable.