From 966e19582c519a4462e7970cd19c0bb1d9ec9c80 Mon Sep 17 00:00:00 2001
From: Heiko Becker <heirecka@exherbo.org>
Date: Fri, 17 Apr 2015 09:50:03 +0100
Subject: [PATCH] FindLibSpectre: Use FindPkgConfig instead of UsePkgConfig

The latter is deprecated and doesn't respect the PKG_CONFIG
environment variable which makes it easy to deal with differently
named pkg-config executables, e.g. arch-prefixed ones.

REVIEW: 123393
---
 cmake/modules/FindLibSpectre.cmake | 54 +++++++++++++-----------------
 1 file changed, 23 insertions(+), 31 deletions(-)

diff --git a/cmake/modules/FindLibSpectre.cmake b/cmake/modules/FindLibSpectre.cmake
index 8d5dc7657..e770519cf 100644
--- a/cmake/modules/FindLibSpectre.cmake
+++ b/cmake/modules/FindLibSpectre.cmake
@@ -20,42 +20,34 @@ if(LIBSPECTRE_INCLUDE_DIR AND LIBSPECTRE_LIBRARY)
 else(LIBSPECTRE_INCLUDE_DIR AND LIBSPECTRE_LIBRARY)
 
 if(NOT WIN32)
-   # use pkg-config to get the directories and then use these values
-   # in the FIND_PATH() and FIND_LIBRARY() calls
-   INCLUDE(UsePkgConfig)
-
-   PKGCONFIG(libspectre _SpectreIncDir _SpectreLinkDir _SpectreLinkFlags _SpectreCflags)
-
-   if(_SpectreLinkFlags)
-     # find again pkg-config, to query it about libspectre version
-     FIND_PROGRAM(PKGCONFIG_EXECUTABLE NAMES pkg-config PATHS /usr/bin/ /usr/local/bin )
-
-     # query pkg-config asking for a libspectre >= LIBSPECTRE_MINIMUM_VERSION
-     EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=${LIBSPECTRE_MINIMUM_VERSION} libspectre RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull )
-     if(_return_VALUE STREQUAL "0")
-        set(LIBSPECTRE_INTERNAL_FOUND TRUE)
-     endif(_return_VALUE STREQUAL "0")
-   endif(_SpectreLinkFlags)
+  # use pkg-config to get the directories and then use these values
+  # in the FIND_PATH() and FIND_LIBRARY() calls
+  include(FindPkgConfig)
+
+  if(LIBSPECTRE_MINIMUM_VERSION})
+    pkg_check_modules(_pc_LIBSPECTRE libspectre>=${LIBSPECTRE_MINIMUM_VERSION})
+  else(LIBSPECTRE_MINIMUM_VERSION})
+    pkg_check_modules(_pc_LIBSPECTRE libspectre)
+  endif(LIBSPECTRE_MINIMUM_VERSION})
 else(NOT WIN32)
-    # do not use pkg-config on windows
-    find_library(_SpectreLinkFlags NAMES libspectre spectre PATHS ${CMAKE_LIBRARY_PATH})
-    
-    find_path(LIBSPECTRE_INCLUDE_DIR spectre.h PATH_SUFFIXES libspectre )
-    
-    set(LIBSPECTRE_INTERNAL_FOUND TRUE)
+  # do not use pkg-config on windows
+  set(_pc_LIBSPECTRE_FOUND TRUE)
 endif(NOT WIN32)
 
-if (LIBSPECTRE_INTERNAL_FOUND)
-  set(LIBSPECTRE_LIBRARY ${_SpectreLinkFlags})
 
-  # the cflags for libspectre can contain more than one include path
-  separate_arguments(_SpectreCflags)
-  foreach(_includedir ${_SpectreCflags})
-    string(REGEX REPLACE "-I(.+)" "\\1" _includedir "${_includedir}")
-    set(LIBSPECTRE_INCLUDE_DIR ${LIBSPECTRE_INCLUDE_DIR} ${_includedir})
-  endforeach(_includedir)
+if(_pc_LIBSPECTRE_FOUND)
+  find_library(LIBSPECTRE_LIBRARY
+    NAMES libspectre spectre
+    HINTS ${_pc_LIBSPECTRE_LIBRARY_DIRS} ${CMAKE_LIBRARY_PATH}
+  )
 
-endif (LIBSPECTRE_INTERNAL_FOUND)
+  find_path(LIBSPECTRE_INCLUDE_DIR spectre.h
+    HINTS ${_pc_LIBSPECTRE_INCLUDE_DIRS}
+    PATH_SUFFIXES libspectre
+  )
+
+  set(LIBSPECTRE_INTERNAL_FOUND TRUE)
+endif(_pc_LIBSPECTRE_FOUND)
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(LibSpectre DEFAULT_MSG LIBSPECTRE_LIBRARY LIBSPECTRE_INTERNAL_FOUND)