Merge pull request #17568 from mantidproject/poco-deb-package-version

Fix package version for Poco on Ubuntu

CMakeLists.txt

@@ -319,7 +319,7 @@ if ( ENABLE_CPACK )
                            "python-matplotlib,"
                            "python-scipy,"
                            "libtbb2,"
-                           "libpocofoundation31,libpocoutil31,libpoconet31,libpoconetssl31,libpococrypto31,libpocoxml31,"
+                           "libpocofoundation${POCO_SOLIB_VERSION},libpocoutil${POCO_SOLIB_VERSION},libpoconet${POCO_SOLIB_VERSION},libpoconetssl${POCO_SOLIB_VERSION},libpococrypto${POCO_SOLIB_VERSION},libpocoxml${POCO_SOLIB_VERSION},"
                            "python-pycifrw (>= 4.2.1)" )
         set ( PERFTOOLS_DEB_PACKAGE "libgoogle-perftools4 (>= 1.7)" )
         if( "${UNIX_CODENAME}" STREQUAL "xenial")

buildconfig/CMake/FindPoco.cmake

@@ -47,9 +47,9 @@ set ( POCO_LIBRARIES ${POCO_LIB_FOUNDATION}
 
 endif()
 
-# Set a version string by examining either the Poco/Version.h header or 
+# Set a version string by examining either the Poco/Version.h header or
 # the Poco/Foundation.h header if Version.h does not exist
-if( POCO_INCLUDE_DIR ) 
+if( POCO_INCLUDE_DIR )
   if ( EXISTS ${POCO_INCLUDE_DIR}/Poco/Version.h )
     set ( VERSION_FILE ${POCO_INCLUDE_DIR}/Poco/Version.h )
   else ()
@@ -72,12 +72,22 @@ if( POCO_INCLUDE_DIR )
   set ( POCO_VERSION "${POCO_VERSION_MAJOR}.${POCO_VERSION_MINOR}.${POCO_VERSION_PATCH}" )
 endif()
 
+# Also set a shared libarary version number. This is different to the main version number
+# and can form part of the package name on some Linux systems
+if( POCO_LIB_FOUNDATION )
+  set ( POCO_SOLIB_VERSION "" )
+  # The library path is usually a symlink to the actually library
+  get_filename_component ( POCO_REAL_LIB_FOUNDATION ${POCO_LIB_FOUNDATION} REALPATH )
+  set ( _LIB_REGEX "^.*.so.([0-9]+)$" )
+  string( REGEX REPLACE ${_LIB_REGEX} "\\1" POCO_SOLIB_VERSION ${POCO_REAL_LIB_FOUNDATION} )
+endif()
+
 
-# handle the QUIETLY and REQUIRED arguments and set POCO_FOUND to TRUE if 
+# handle the QUIETLY and REQUIRED arguments and set POCO_FOUND to TRUE if
 # all listed variables are TRUE
 include ( FindPackageHandleStandardArgs )
 if (POCO_VERSION)
-  find_package_handle_standard_args( Poco REQUIRED_VARS POCO_LIBRARIES POCO_INCLUDE_DIR 
+  find_package_handle_standard_args( Poco REQUIRED_VARS POCO_LIBRARIES POCO_INCLUDE_DIR
                                      VERSION_VAR POCO_VERSION )
 else ()
   message (status "Failed to determine Poco version: Ignoring requirement")