gnucash maint: Use default PKG_CHECK_MODULES for CMake version > 3.4

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash/commit/c599bf3c (commit)
	from  https://github.com/Gnucash/gnucash/commit/b905c4a2 (commit)



commit c599bf3c0b50185b07e2b1d565c8fe11d3dfb862
Author: Rob Gowin <robgowin at gmail.com>
Date:   Tue Sep 27 11:24:36 2016 -0500

    Use default PKG_CHECK_MODULES for CMake version > 3.4

diff --git a/src/cmake_modules/GncFindPkgConfig.cmake b/src/cmake_modules/GncFindPkgConfig.cmake
index 46a55b7..96c85c8 100644
--- a/src/cmake_modules/GncFindPkgConfig.cmake
+++ b/src/cmake_modules/GncFindPkgConfig.cmake
@@ -1,4 +1,4 @@
-if(${CMAKE_VERSION} VERSION_GREATER 3.1)
+if((${CMAKE_VERSION} VERSION_GREATER 3.1) AND (${CMAKE_VERSION} VERSION_LESS 3.5))
 
 function (pkg_get_variable result pkg variable)
   _pkgconfig_invoke("${pkg}" "prefix" "result" "" "--variable=${variable}")
@@ -247,12 +247,10 @@ endmacro()
 
 else()
 
+include(FindPkgConfig)
+
 macro(gnc_pkg_check_modules _prefix _module0)
-  if (NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION} OR NOT ${_prefix}_FOUND)
-    _pkgconfig_parse_options   (_pkg_modules _pkg_is_required _pkg_is_silent "${_module0}" ${ARGN})
-    _pkg_check_modules_internal("${_pkg_is_required}" "${_pkg_is_silent}" "${_prefix}" ${_pkg_modules})
-    _pkgconfig_set(__pkg_config_checked_${_prefix} ${PKG_CONFIG_VERSION})
-  endif()
+   PKG_CHECK_MODULES(${_prefix} ${_module0} ${ARGN})
 endmacro()
 
 endif()



Summary of changes:
 src/cmake_modules/GncFindPkgConfig.cmake | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)