buildsystem - improve discovery for Glib, LibXML, GObject

allow not passing a min version.
ie. any version will do

3 files changed, 26 insertions, 23 deletions

diff --git a/cmake/modules/FindGLib.cmake b/cmake/modules/FindGLib.cmake
index 9d075967..1092dc14 100644
--- a/cmake/modules/FindGLib.cmake
+++ b/cmake/modules/FindGLib.cmake
@@ -13,15 +13,16 @@ set_package_properties(GLib PROPERTIES
 
 find_package(PkgConfig)
 if(PKG_CONFIG_FOUND)
+  set(_glib_version_cmp)
   if(DEFINED GLib_FIND_VERSION)
     set(_glib_version_cmp ${GLib_FIND_VERSION})
     set(_glib_version_cmp ">=${_glib_version_cmp}")
-    pkg_check_modules(_pc_glib glib-2.0${_glib_version_cmp} gobject-2.0${_glib_version_cmp})
-    if(_pc_glib_FOUND)
-      set(GLIB_FOUND TRUE)
-      set(GLIB_CFLAGS "${_pc_glib_CFLAGS}")
-      set(GLIB_LIBRARIES "${_pc_glib_LDFLAGS}")
-    endif()
+  endif()
+  pkg_check_modules(_pc_glib glib-2.0${_glib_version_cmp} gobject-2.0${_glib_version_cmp})
+  if(_pc_glib_FOUND)
+    set(GLIB_FOUND TRUE)
+    set(GLIB_CFLAGS "${_pc_glib_CFLAGS}")
+    set(GLIB_LIBRARIES "${_pc_glib_LDFLAGS}")
   endif()
 endif()
 
diff --git a/cmake/modules/FindGObjectIntrospection.cmake b/cmake/modules/FindGObjectIntrospection.cmake
index 262c7025..02841f4f 100644
--- a/cmake/modules/FindGObjectIntrospection.cmake
+++ b/cmake/modules/FindGObjectIntrospection.cmake
@@ -34,20 +34,21 @@ endmacro(_GIR_GET_PKGCONFIG_VAR)
 
 find_package(PkgConfig)
 if(PKG_CONFIG_FOUND)
+  set(_gir_version_cmp)
   if(DEFINED GObjectIntrospection_FIND_VERSION)
     set(_gir_version_cmp "${GObjectIntrospection_FIND_VERSION}")
     set(_gir_version_cmp ">=${_gir_version_cmp}")
-    pkg_check_modules(_pc_gir gobject-introspection-1.0${_gir_version_cmp})
-    if(_pc_gir_FOUND)
-      set(GObjectIntrospection_FOUND TRUE)
-      _gir_get_pkgconfig_var(GObjectIntrospection_SCANNER "g_ir_scanner")
-      _gir_get_pkgconfig_var(GObjectIntrospection_COMPILER "g_ir_compiler")
-      _gir_get_pkgconfig_var(GObjectIntrospection_GENERATE "g_ir_generate")
-      _gir_get_pkgconfig_var(GObjectIntrospection_GIRDIR "girdir")
-      _gir_get_pkgconfig_var(GObjectIntrospection_TYPELIBDIR "typelibdir")
-      set(GObjectIntrospection_CFLAGS "${_pc_gir_CFLAGS}")
-      set(GObjectIntrospection_LIBS "${_pc_gir_LIBS}")
-    endif()
+  endif()
+  pkg_check_modules(_pc_gir gobject-introspection-1.0${_gir_version_cmp})
+  if(_pc_gir_FOUND)
+    set(GObjectIntrospection_FOUND TRUE)
+    _gir_get_pkgconfig_var(GObjectIntrospection_SCANNER "g_ir_scanner")
+    _gir_get_pkgconfig_var(GObjectIntrospection_COMPILER "g_ir_compiler")
+    _gir_get_pkgconfig_var(GObjectIntrospection_GENERATE "g_ir_generate")
+    _gir_get_pkgconfig_var(GObjectIntrospection_GIRDIR "girdir")
+    _gir_get_pkgconfig_var(GObjectIntrospection_TYPELIBDIR "typelibdir")
+    set(GObjectIntrospection_CFLAGS "${_pc_gir_CFLAGS}")
+    set(GObjectIntrospection_LIBS "${_pc_gir_LIBS}")
   endif()
 endif()
 
diff --git a/cmake/modules/FindLibXML.cmake b/cmake/modules/FindLibXML.cmake
index e99bf652..3c418b67 100644
--- a/cmake/modules/FindLibXML.cmake
+++ b/cmake/modules/FindLibXML.cmake
@@ -8,15 +8,16 @@
 
 find_package(PkgConfig)
 if(PKG_CONFIG_FOUND)
+  set(_libxml_version_cmp)
   if(DEFINED LibXML_FIND_VERSION)
     set(_libxml_version_cmp ${LibXML_FIND_VERSION})
     set(_libxml_version_cmp ">=${_libxml_version_cmp}")
-    pkg_check_modules(_pc_libxml libxml-2.0${_libxml_version_cmp})
-    if(_pc_libxml_FOUND)
-      set(LIBXML_FOUND TRUE)
-      set(LIBXML_CFLAGS "${_pc_libxml_CFLAGS}")
-      set(LIBXML_LIBRARIES "${_pc_libxml_LIBRARIES}")
-    endif()
+  endif()
+  pkg_check_modules(_pc_libxml libxml-2.0${_libxml_version_cmp})
+  if(_pc_libxml_FOUND)
+    set(LIBXML_FOUND TRUE)
+    set(LIBXML_CFLAGS "${_pc_libxml_CFLAGS}")
+    set(LIBXML_LIBRARIES "${_pc_libxml_LIBRARIES}")
   endif()
 endif()