From 072bdd9a6b3fcfb63201e026db0101d4b5773e87 Mon Sep 17 00:00:00 2001 From: Jim Hague Date: Thu, 24 Oct 2019 17:30:41 +0100 Subject: [PATCH] Pay attention to hint directories for Check. Allow specifying a base hint directory, and look there and in include/libs underneath it. --- cmake/modules/FindCheck.cmake | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cmake/modules/FindCheck.cmake b/cmake/modules/FindCheck.cmake index 73bf9e614..908376d5a 100644 --- a/cmake/modules/FindCheck.cmake +++ b/cmake/modules/FindCheck.cmake @@ -33,23 +33,23 @@ This module will set the following variables in your project: find_path(CHECK_INCLUDE_DIR check.h HINTS - ${PC_CHECK_INCLUDEDIR} - ${PC_CHECK_INCLUDE_DIRS} + "${CHECK_DIR}" + "${CHECK_DIR}/include" ) # Check for PIC and non-PIC libraries. If PIC present, use that # in preference (as per Debian check.pc). find_library(CHECK_LIBRARY NAMES check_pic libcheck_pic HINTS - ${PC_CHECK_LIBDIR} - ${PC_CHECK_LIBRARY_DIRS} + "${CHECK_DIR}" + "${CHECK_DIR}/lib" ) if (NOT CHECK_LIBRARY) find_library(CHECK_LIBRARY NAMES check libcheck HINTS - ${PC_CHECK_LIBDIR} - ${PC_CHECK_LIBRARY_DIRS} + "${CHECK_DIR}" + "${CHECK_DIR}/lib" ) endif ()