diff --git a/cmake/FindLibcheck.cmake b/cmake/FindLibcheck.cmake index 0a5ceab55..8106fa5b1 100644 --- a/cmake/FindLibcheck.cmake +++ b/cmake/FindLibcheck.cmake @@ -37,7 +37,14 @@ set(LIBCHECK_ROOT_DIR "${LIBCHECK_ROOT_DIR}" CACHE PATH "Root to search for libc find_package(PkgConfig QUIET) if(PKG_CONFIG_FOUND) + set(_old_prefix_path "${CMAKE_PREFIX_PATH}") + # So pkg-config uses LIBCHECK_ROOT_DIR too. + if(LIBCHECK_ROOT_DIR) + list(APPEND CMAKE_PREFIX_PATH ${LIBCHECK_ROOT_DIR}) + endif() pkg_check_modules(PC_LIBCHECK QUIET check) + # Restore + set(CMAKE_PREFIX_PATH "${_old_prefix_path}") endif() find_path(LIBCHECK_INCLUDE_DIR NAMES diff --git a/cmake/FindOpenHMD.cmake b/cmake/FindOpenHMD.cmake index 79dae8a6d..3bb1ba549 100644 --- a/cmake/FindOpenHMD.cmake +++ b/cmake/FindOpenHMD.cmake @@ -33,8 +33,16 @@ set(OPENHMD_ROOT_DIR "${OPENHMD_ROOT_DIR}" CACHE PATH "Root to search for OpenHM find_package(PkgConfig QUIET) if(PKG_CONFIG_FOUND) + set(_old_prefix_path "${CMAKE_PREFIX_PATH}") + # So pkg-config uses OPENHMD_ROOT_DIR too. + if(OPENHMD_ROOT_DIR) + list(APPEND CMAKE_PREFIX_PATH ${OPENHMD_ROOT_DIR}) + endif() pkg_check_modules(PC_OPENHMD QUIET openhmd) + # Restore + set(CMAKE_PREFIX_PATH "${_old_prefix_path}") endif() + find_path(OPENHMD_INCLUDE_DIR NAMES openhmd.h