diff options
| author | fuzzard <fuzzard@kodi.tv> | 2023-09-21 14:32:45 +1000 |
|---|---|---|
| committer | fuzzard <fuzzard@kodi.tv> | 2023-09-24 14:07:23 +1000 |
| commit | a5fe59cdbe46b491c9fb36623160053427ab1519 (patch) | |
| tree | 1c34b86bb6a8d6489f93a48778046f8372472878 /cmake | |
| parent | e0b42ee7cd099aff3c7fa9514e3a54c4cd901954 (diff) | |
[cmake] FindCrossGUID add stricter search paths
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/FindCrossGUID.cmake | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/cmake/modules/FindCrossGUID.cmake b/cmake/modules/FindCrossGUID.cmake index 9f98b8a2c5..5ba39e3cb4 100644 --- a/cmake/modules/FindCrossGUID.cmake +++ b/cmake/modules/FindCrossGUID.cmake @@ -38,17 +38,25 @@ if(NOT TARGET CrossGUID::CrossGUID) if(ENABLE_INTERNAL_CROSSGUID) buildCrossGUID() else() - if(PKG_CONFIG_FOUND) + find_package(PkgConfig) + # Do not use pkgconfig on windows + if(PKG_CONFIG_FOUND AND NOT WIN32) pkg_check_modules(PC_CROSSGUID crossguid QUIET) set(CROSSGUID_VERSION ${PC_CROSSGUID_VERSION}) endif() find_path(CROSSGUID_INCLUDE_DIR NAMES crossguid/guid.hpp guid.h - HINTS ${DEPENDS_PATH}/include ${PC_CROSSGUID_INCLUDEDIR}) + HINTS ${DEPENDS_PATH}/include ${PC_CROSSGUID_INCLUDEDIR} + ${${CORE_PLATFORM_LC}_SEARCH_CONFIG} + NO_CACHE) find_library(CROSSGUID_LIBRARY_RELEASE NAMES crossguid - HINTS ${DEPENDS_PATH}/lib ${PC_CROSSGUID_LIBDIR}) + HINTS ${DEPENDS_PATH}/lib ${PC_CROSSGUID_LIBDIR} + ${${CORE_PLATFORM_LC}_SEARCH_CONFIG} + NO_CACHE) find_library(CROSSGUID_LIBRARY_DEBUG NAMES crossguidd crossguid-dgb - HINTS ${DEPENDS_PATH}/lib ${PC_CROSSGUID_LIBDIR}) + HINTS ${DEPENDS_PATH}/lib ${PC_CROSSGUID_LIBDIR} + ${${CORE_PLATFORM_LC}_SEARCH_CONFIG} + NO_CACHE) # NEW_CROSSGUID >= 0.2.0 release if(EXISTS "${CROSSGUID_INCLUDE_DIR}/crossguid/guid.hpp") |