[config] Improved support for PostgreSQL and slightly upgraded FindXWrapper.cmake scripts

Author: da115115

CMakeLists.txt

@@ -66,8 +66,8 @@ packaging_set_other_options (TBZ2 "TBZ2;TGZ")
 ##            Dependencies            ##
 ########################################
 #
-get_external_libs (git "python 3.6" "boost 1.48" "icu 4.2" protobuf readline
-  "xapian 1.0" "soci 3.0" "sqlite 3.0" "mysql 5.1" doxygen)
+get_external_libs (git "python 3.10" "boost 1.48" "icu 4.2" protobuf readline
+  "xapian 1.0" "soci 4.0" "sqlite 3.0" "postgres 9"  "mysql 5.1" doxygen)
 
 
 ##############################################

config/FindBoostWrapper.cmake

@@ -15,14 +15,9 @@ message (STATUS "Found Boost version: ${Boost_HUMAN_VERSION}")
 
 # Check the version requirement only
 include (FindPackageHandleStandardArgs)
-if (${CMAKE_VERSION} VERSION_GREATER 2.8.1)
-  find_package_handle_standard_args (BoostWrapper
-	REQUIRED_VARS Boost_INCLUDE_DIRS Boost_LIBRARY_DIRS
-	VERSION_VAR Boost_HUMAN_VERSION)
-else (${CMAKE_VERSION} VERSION_GREATER 2.8.1)
-  find_package_handle_standard_args (BoostWrapper
-	DEFAULT_MSG Boost_INCLUDE_DIRS Boost_LIBRARY_DIRS)
-endif (${CMAKE_VERSION} VERSION_GREATER 2.8.1)
+find_package_handle_standard_args (BoostWrapper
+  REQUIRED_VARS Boost_INCLUDE_DIRS Boost_LIBRARY_DIRS
+  VERSION_VAR Boost_HUMAN_VERSION)
 
 if (BOOSTWRAPPER_FOUND)
   mark_as_advanced (BOOSTWRAPPER_FOUND Boost_HUMAN_VERSION)

config/FindDoxygenWrapper.cmake

@@ -13,14 +13,9 @@ if (DOXYGEN_FOUND STREQUAL "YES")
 
   # Check the version requirement only
   include (FindPackageHandleStandardArgs)
-  if (${CMAKE_VERSION} VERSION_GREATER 2.8.1)
-	find_package_handle_standard_args (DoxygenWrapper
-	  REQUIRED_VARS DOXYGEN_EXECUTABLE
-	  VERSION_VAR DOXYGEN_VERSION)
-  else (${CMAKE_VERSION} VERSION_GREATER 2.8.1)
-	find_package_handle_standard_args (DoxygenWrapper
-	  DEFAULT_MSG DOXYGEN_EXECUTABLE)
-  endif (${CMAKE_VERSION} VERSION_GREATER 2.8.1)
+  find_package_handle_standard_args (DoxygenWrapper
+	REQUIRED_VARS DOXYGEN_EXECUTABLE
+	VERSION_VAR DOXYGEN_VERSION)
 
 endif (DOXYGEN_FOUND STREQUAL "YES")