HPCC-14160 Added macro for dependencies

Signed-off-by: Michael Gardner <Michael.Gardner@lexisnexis.com>

cmake_modules/commonSetup.cmake

@@ -739,4 +739,16 @@ IF ("${COMMONSETUP_DONE}" STREQUAL "")
         endif()
   ENDMACRO()
 
+  ###########################################################################
+  ###
+  ## The following sets the dependency list for a package
+  ###
+  MACRO(SET_DEPENDENCIES dependencies cpackvar)
+    if ( ${cpackvar} )
+      set ( ${cpackvar} "${dependencies}, ${${cpackvar}}" CACHE STRING "" FORCE )
+    else()
+      set ( ${cpackvar} "${dependencies}" CACHE STRING "" )
+    endif()
+  ENDMACRO()
+
 endif ("${COMMONSETUP_DONE}" STREQUAL "")

cmake_modules/dependencies/el5.cmake

@@ -1,5 +1 @@
-if ( CPACK_RPM_PACKAGE_REQUIRES )
-    set ( CPACK_RPM_PACKAGE_REQUIRES "${CPACK_RPM_PACKAGE_REQUIRES}, boost141-regex, openldap, libicu, m4, libtool, libxslt, libxml2, gcc-c++, openssh-server, openssh-clients, expect, libarchive, rsync, apr, apr-util, zip, tbb" CACHE STRING "" FORCE )
-else()
-    set ( CPACK_RPM_PACKAGE_REQUIRES "boost141-regex, openldap, libicu, m4, libtool, libxslt, libxml2, gcc-c++, openssh-server, openssh-clients, expect, libarchive, rsync, apr, apr-util, zip, tbb" CACHE STRING "" )
-endif()
+SET_DEPENDENCIES ( "boost141-regex, openldap, libicu, m4, libtool, libxslt, libxml2, gcc-c++, openssh-server, openssh-clients, expect, libarchive, rsync, apr, apr-util, zip, tbb" CPACK_RPM_PACKAGE_REQUIRES )

cmake_modules/dependencies/el6.cmake

@@ -1,5 +1 @@
-if ( CPACK_RPM_PACKAGE_REQUIRES )
-    set ( CPACK_RPM_PACKAGE_REQUIRES "${CPACK_RPM_PACKAGE_REQUIRES}, boost-regex, openldap, libicu, m4, libtool, libxslt, libxml2, gcc-c++, openssh-server, openssh-clients, expect, libarchive, rsync, apr, apr-util, zip, tbb" CACHE STRING "" FORCE )
-else()
-    set ( CPACK_RPM_PACKAGE_REQUIRES "boost-regex, openldap, libicu, m4, libtool, libxslt, libxml2, gcc-c++, openssh-server, openssh-clients, expect, libarchive, rsync, apr, apr-util, zip, tbb" CACHE STRING "" )
-endif()
+SET_DEPENDENCIES ( "boost-regex, openldap, libicu, m4, libtool, libxslt, libxml2, gcc-c++, openssh-server, openssh-clients, expect, libarchive, rsync, apr, apr-util, zip, tbb" CPACK_RPM_PACKAGE_REQUIRES )

cmake_modules/dependencies/el7.cmake

@@ -1,5 +1 @@
-if ( CPACK_RPM_PACKAGE_REQUIRES )
-    set ( CPACK_RPM_PACKAGE_REQUIRES "${CPACK_RPM_PACKAGE_REQUIRES}, boost-regex, openldap, libicu, m4, libtool, libxslt, libxml2, gcc-c++, openssh-server, openssh-clients, expect, libarchive, rsync, apr, apr-util, zip, tbb" CACHE STRING "" FORCE )
-else()
-    set ( CPACK_RPM_PACKAGE_REQUIRES "boost-regex, openldap, libicu, m4, libtool, libxslt, libxml2, gcc-c++, openssh-server, openssh-clients, expect, libarchive, rsync, apr, apr-util, zip, tbb" CACHE STRING "" )
-endif()
+SET_DEPENDENCIES ( "boost-regex, openldap, libicu, m4, libtool, libxslt, libxml2, gcc-c++, openssh-server, openssh-clients, expect, libarchive, rsync, apr, apr-util, zip, tbb" CPACK_RPM_PACKAGE_REQUIRES )

cmake_modules/dependencies/lenny.cmake

@@ -1,5 +1 @@
-if ( CPACK_DEBIAN_PACKAGE_DEPENDS )
-    set ( CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS}, libboost-regex1.34.1, libicu38, libxalan110, libxerces-c28, binutils, libldap-2.4-2, openssl, zlib1g, g++, sudo, openssh-client, openssh-server, expect, libarchive, rsync, libapr1, libaprutil1, zip, python, libtbb2" CACHE STRING "" FORCE)
-else()
-    set ( CPACK_DEBIAN_PACKAGE_DEPENDS "libboost-regex1.34.1, libicu38, libxalan110, libxerces-c28, binutils, libldap-2.4-2, openssl, zlib1g, g++, sudo, openssh-client, openssh-server, expect, libarchive, rsync, libapr1, libaprutil1, zip, python, libtbb2" CACHE STRING "" )
-endif()
+SET_DEPENDENCIES ( "libboost-regex1.34.1, libicu38, libxalan110, libxerces-c28, binutils, libldap-2.4-2, openssl, zlib1g, g++, sudo, openssh-client, openssh-server, expect, libarchive, rsync, libapr1, libaprutil1, zip, python, libtbb2" CPACK_DEBIAN_PACKAGE_DEPENDS )

cmake_modules/dependencies/lucid.cmake

@@ -1,5 +1 @@
-if ( CPACK_DEBIAN_PACKAGE_DEPENDS )
-    set ( CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS}, libboost-regex1.40.0, libicu42, libxslt1.1, libxml2, binutils, libldap-2.4-2, openssl, zlib1g, g++, openssh-client, openssh-server, expect, libarchive1, rsync, zip, python, libtbb2" CACHE STRING "" FORCE)
-else()
-    set ( CPACK_DEBIAN_PACKAGE_DEPENDS "libboost-regex1.40.0, libicu42, libxslt1.1, libxml2, binutils, libldap-2.4-2, openssl, zlib1g, g++, openssh-client, openssh-server, expect, libarchive1, rsync, zip, python, libtbb2" CACHE STRING "")
-endif()
+SET_DEPENDENCIES ( "libboost-regex1.40.0, libicu42, libxslt1.1, libxml2, binutils, libldap-2.4-2, openssl, zlib1g, g++, openssh-client, openssh-server, expect, libarchive1, rsync, zip, python, libtbb2" CPACK_DEBIAN_PACKAGE_DEPENDS )

cmake_modules/dependencies/natty.cmake

@@ -1,5 +1 @@
-if ( CPACK_DEBIAN_PACKAGE_DEPENDS )
-    set ( CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS}, libboost-regex1.42.0, libicu44, libxalan110, libxerces-c28, binutils, libldap-2.4-2, openssl, zlib1g, g++, openssh-client, openssh-server, expect, libarchive1, rsync, zip, python, libtbb2" CACHE STRING "" FORCE)
-else()
-    set ( CPACK_DEBIAN_PACKAGE_DEPENDS "libboost-regex1.42.0, libicu44, libxalan110, libxerces-c28, binutils, libldap-2.4-2, openssl, zlib1g, g++, openssh-client, openssh-server, expect, libarchive1, rsync, zip, python, libtbb2" CACHE STRING "")
-endif()
+SET_DEPENDENCIES ( "libboost-regex1.42.0, libicu44, libxalan110, libxerces-c28, binutils, libldap-2.4-2, openssl, zlib1g, g++, openssh-client, openssh-server, expect, libarchive1, rsync, zip, python, libtbb2" CPACK_DEBIAN_PACKAGE_DEPENDS )

cmake_modules/dependencies/oneiric.cmake

@@ -1,5 +1 @@
-if ( CPACK_DEBIAN_PACKAGE_DEPENDS )
-    set ( CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS}, libboost-regex1.46.1, libicu44, libxalan110, libxerces-c28, binutils, libldap-2.4-2, openssl, zlib1g, g++, openssh-client, openssh-server, expect, libarchive1, rsync, libapr1, libaprutil1, zip, python, libtbb2" CACHE STRING "" FORCE)
-else()
-    set ( CPACK_DEBIAN_PACKAGE_DEPENDS "libboost-regex1.46.1, libicu44, libxalan110, libxerces-c28, binutils, libldap-2.4-2, openssl, zlib1g, g++, openssh-client, openssh-server, expect, libarchive1, rsync, libapr1, libaprutil1, zip, python, libtbb2" CACHE STRING "")
-endif()
+SET_DEPENDENCIES ( "libboost-regex1.46.1, libicu44, libxalan110, libxerces-c28, binutils, libldap-2.4-2, openssl, zlib1g, g++, openssh-client, openssh-server, expect, libarchive1, rsync, libapr1, libaprutil1, zip, python, libtbb2" CPACK_DEBIAN_PACKAGE_DEPENDS )

cmake_modules/dependencies/precise.cmake

@@ -1,5 +1 @@
-if ( CPACK_DEBIAN_PACKAGE_DEPENDS )
-    set ( CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS}, libboost-regex1.46.1, libicu48, libxslt1.1, libxml2, binutils, libldap-2.4-2, openssl, zlib1g, g++, openssh-client, openssh-server, expect, libarchive12, rsync, libapr1, libaprutil1, zip, python, libtbb2" CACHE STRING "" FORCE)
-else()
-    set ( CPACK_DEBIAN_PACKAGE_DEPENDS "libboost-regex1.46.1, libicu48, libxslt1.1, libxml2, binutils, libldap-2.4-2, openssl, zlib1g, g++, openssh-client, openssh-server, expect, libarchive12, rsync, libapr1, libaprutil1, zip, python, libtbb2" CACHE STRING "")
-endif()
+SET_DEPENDENCIES ( "libboost-regex1.46.1, libicu48, libxslt1.1, libxml2, binutils, libldap-2.4-2, openssl, zlib1g, g++, openssh-client, openssh-server, expect, libarchive12, rsync, libapr1, libaprutil1, zip, python, libtbb2" CPACK_DEBIAN_PACKAGE_DEPENDS )

cmake_modules/dependencies/quantal.cmake

@@ -1,5 +1 @@
-if ( CPACK_DEBIAN_PACKAGE_DEPENDS )
-    set ( CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS}, libboost-regex1.49.0, libicu48, libxalan110, libxerces-c28, binutils, libldap-2.4-2, openssl, zlib1g, g++, openssh-client, openssh-server, expect, libarchive12, rsync, libapr1, libaprutil1, zip, python, libtbb2" CACHE STRING "" FORCE)
-else()
-    set ( CPACK_DEBIAN_PACKAGE_DEPENDS "libboost-regex1.49.0, libicu48, libxalan110, libxerces-c28, binutils, libldap-2.4-2, openssl, zlib1g, g++, openssh-client, openssh-server, expect, libarchive12, rsync, libapr1, libaprutil1, zip, python, libtbb2" CACHE STRING "")
-endif()
+SET_DEPENDENCIES ( "libboost-regex1.49.0, libicu48, libxalan110, libxerces-c28, binutils, libldap-2.4-2, openssl, zlib1g, g++, openssh-client, openssh-server, expect, libarchive12, rsync, libapr1, libaprutil1, zip, python, libtbb2" CPACK_DEBIAN_PACKAGE_DEPENDS )

cmake_modules/dependencies/raring.cmake

@@ -1,5 +1 @@
-if ( CPACK_DEBIAN_PACKAGE_DEPENDS )
-    set ( CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS}, libboost-regex1.49.0, libicu48, libxalan110, libxerces-c28, binutils, libldap-2.4-2, openssl, zlib1g, g++, openssh-client, openssh-server, expect, libarchive13, rsync, libapr1, libaprutil1, zip, libtbb2" CACHE STRING "" FORCE)
-else()
-    set ( CPACK_DEBIAN_PACKAGE_DEPENDS "libboost-regex1.49.0, libicu48, libxalan110, libxerces-c28, binutils, libldap-2.4-2, openssl, zlib1g, g++, openssh-client, openssh-server, expect, libarchive13, rsync, libapr1, libaprutil1, zip, libtbb2" CACHE STRING "")
-endif()
+SET_DEPENDENCIES ( "libboost-regex1.49.0, libicu48, libxalan110, libxerces-c28, binutils, libldap-2.4-2, openssl, zlib1g, g++, openssh-client, openssh-server, expect, libarchive13, rsync, libapr1, libaprutil1, zip, libtbb2" CPACK_DEBIAN_PACKAGE_DEPENDS )

cmake_modules/dependencies/saucy.cmake

@@ -1,5 +1 @@
-if ( CPACK_DEBIAN_PACKAGE_DEPENDS )
-    set ( CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS}, libboost-regex1.53.0, libicu48, libxalan-c111, libxerces-c3.1, binutils, libldap-2.4-2, openssl, zlib1g, g++, openssh-client, openssh-server, expect, libarchive13, rsync, libapr1, libaprutil1, zip, python, libtbb2" CACHE STRING "" FORCE)
-else()
-    set ( CPACK_DEBIAN_PACKAGE_DEPENDS "libboost-regex1.53.0, libicu48, libxalan-c111, libxerces-c3.1, binutils, libldap-2.4-2, openssl, zlib1g, g++, openssh-client, openssh-server, expect, libarchive13, rsync, libapr1, libaprutil1, zip, python, libtbb2" CACHE STRING "" )
-endif()
+SET_DEPENDENCIES ( "libboost-regex1.53.0, libicu48, libxalan-c111, libxerces-c3.1, binutils, libldap-2.4-2, openssl, zlib1g, g++, openssh-client, openssh-server, expect, libarchive13, rsync, libapr1, libaprutil1, zip, python, libtbb2" CPACK_DEBIAN_PACKAGE_DEPENDS )

cmake_modules/dependencies/squeeze.cmake

@@ -1,5 +1 @@
-if ( CPACK_DEBIAN_PACKAGE_DEPENDS )
-    set ( CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS}, libboost-regex1.42.0, libicu44, libxalan110, libxerces-c28, binutils, libldap-2.4-2, openssl, zlib1g, g++, openssh-client, openssh-server, expect, libarchive1, rsync, libapr1, libaprutil1, zip, python, libtbb2" CACHE STRING "" FORCE )
-else()
-    set ( CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS}, libboost-regex1.42.0, libicu44, libxalan110, libxerces-c28, binutils, libldap-2.4-2, openssl, zlib1g, g++, openssh-client, openssh-server, expect, libarchive1, rsync, libapr1, libaprutil1, zip, python, libtbb2" CACHE STRING "" )
-endif()
+SET_DEPENDENCIES ( "libboost-regex1.42.0, libicu44, libxalan110, libxerces-c28, binutils, libldap-2.4-2, openssl, zlib1g, g++, openssh-client, openssh-server, expect, libarchive1, rsync, libapr1, libaprutil1, zip, python, libtbb2" CPACK_DEBIAN_PACKAGE_DEPENDS )

cmake_modules/dependencies/suse11.3.cmake

@@ -1,5 +1 @@
-if ( CPACK_RPM_PACKAGE_REQUIRES )
-    set ( CPACK_RPM_PACKAGE_REQUIRES  "${CPACK_RPM_PACKAGE_REQUIRES}, binutils, gcc-c++, openssh, libldap-2_4-2, libicu, libboost_regex1_42_0, libxerces-c-3_0, libxalan-c110, expect, libarchive2, rsync, apr, apr-util, zip" CACHE STRING "" FORCE )
-else()
-    set ( CPACK_RPM_PACKAGE_REQUIRES  "binutils, gcc-c++, openssh, libldap-2_4-2, libicu, libboost_regex1_42_0, libxerces-c-3_0, libxalan-c110, expect, libarchive2, rsync, apr, apr-util, zip" CACHE STRING "")
-endif()
+SET_DEPENDENCIES ( "binutils, gcc-c++, openssh, libldap-2_4-2, libicu, libboost_regex1_42_0, libxerces-c-3_0, libxalan-c110, expect, libarchive2, rsync, apr, apr-util, zip" CPACK_RPM_PACKAGE_REQUIRES )

cmake_modules/dependencies/suse11.4.cmake

@@ -1,5 +1 @@
-if ( CPACK_RPM_PACKAGE_REQUIRES )
-    set ( CPACK_RPM_PACKAGE_REQUIRES  "${CPACK_RPM_PACKAGE_REQUIRES}, binutils, gcc-c++, openssh, libldap-2_4-2, libicu, libboost_regex1_44_0, libxerces-c-3_0, libxalan-c110, expect, libarchive2, rsync, apr, apr-util, zip" CACHE STRING "" FORCE )
-else()
-    set ( CPACK_RPM_PACKAGE_REQUIRES  "binutils, gcc-c++, openssh, libldap-2_4-2, libicu, libboost_regex1_44_0, libxerces-c-3_0, libxalan-c110, expect, libarchive2, rsync, apr, apr-util, zip" CACHE STRING "" )
-endif()
+SET_DEPENDENCIES ( "binutils, gcc-c++, openssh, libldap-2_4-2, libicu, libboost_regex1_44_0, libxerces-c-3_0, libxalan-c110, expect, libarchive2, rsync, apr, apr-util, zip" CPACK_RPM_PACKAGE_REQUIRES )

cmake_modules/dependencies/template.cmake

@@ -6,7 +6,7 @@
 #       ex. Centos 5.x            el5.cmake
 #
 # 2. Add a DEPENDS line based on the package system of your distribution.
-#       ex. set ( CPACK_DEBIAN_PACKAGE_DEPENDS "libicu,libboost-regex1.42.0")
-#       ex. set ( CPACK_RPM_PACKAGE_REQUIRES "libicu, boost")
+#       ex. SET_DEPENDENCIES ( "libicu, libboost-regex1.42.0" CPACK_DEBIAN_PACKAGE_DEPENDS)
+#       ex. SET_DEPENDENCIES ( "libicu, boost" CPACK_RPM_PACKAGE_REQUIRES)
 #
-# 3. Save your changes and create a build from your build directory with `make package`
+# 3. Save your changes and create a build from your build directory with `make package`

cmake_modules/dependencies/trusty.cmake

@@ -1,5 +1 @@
-if ( CPACK_DEBIAN_PACKAGE_DEPENDS )
-    set ( CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS}, libboost-regex1.54.0, libicu52, libxslt1.1, libxml2, binutils, libldap-2.4-2, openssl, zlib1g, g++, openssh-client, openssh-server, expect, libarchive13, rsync, libapr1, libaprutil1, zip, python, libtbb2" CACHE STRING "" FORCE)
-else()
-    set ( CPACK_DEBIAN_PACKAGE_DEPENDS "libboost-regex1.54.0, libicu52, libxslt1.1, libxml2, binutils, libldap-2.4-2, openssl, zlib1g, g++, openssh-client, openssh-server, expect, libarchive13, rsync, libapr1, libaprutil1, zip, python, libtbb2" CACHE STRING "" )
-endif()
+SET_DEPENDENCIES ( "libboost-regex1.54.0, libicu52, libxslt1.1, libxml2, binutils, libldap-2.4-2, openssl, zlib1g, g++, openssh-client, openssh-server, expect, libarchive13, rsync, libapr1, libaprutil1, zip, python, libtbb2" CPACK_DEBIAN_PACKAGE_DEPENDS )

cmake_modules/dependencies/utopic.cmake

@@ -1,5 +1 @@
-if ( CPACK_DEBIAN_PACKAGE_DEPENDS )
-    set ( CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS}, libboost-regex1.55.0, libicu52, libxslt1.1, libxml2, binutils, libldap-2.4-2, openssl, zlib1g, g++, openssh-client, openssh-server, expect, libarchive13, rsync, libapr1, libaprutil1, python, libtbb2" CACHE STRING "" FORCE)
-else()
-    set ( CPACK_DEBIAN_PACKAGE_DEPENDS "libboost-regex1.55.0, libicu52, libxslt1.1, libxml2, binutils, libldap-2.4-2, openssl, zlib1g, g++, openssh-client, openssh-server, expect, libarchive13, rsync, libapr1, libaprutil1, python, libtbb2" CACHE STRING "")
-endif()
+SET_DEPENDENCIES ( "libboost-regex1.55.0, libicu52, libxslt1.1, libxml2, binutils, libldap-2.4-2, openssl, zlib1g, g++, openssh-client, openssh-server, expect, libarchive13, rsync, libapr1, libaprutil1, python, libtbb2" CPACK_DEBIAN_PACKAGE_DEPENDS )

cmake_modules/dependencies/vivid.cmake

@@ -1,5 +1 @@
-if ( CPACK_DEBIAN_PACKAGE_DEPENDS )
-    set ( CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS}, libboost-regex1.55.0, libicu52, libxslt1.1, libxml2, binutils, libldap-2.4-2, openssl, zlib1g, g++, openssh-client, openssh-server, expect, libarchive13, rsync, libapr1, libaprutil1, python, libtbb2" CACHE STRING "" FORCE)
-else()
-    set ( CPACK_DEBIAN_PACKAGE_DEPENDS "libboost-regex1.55.0, libicu52, libxslt1.1, libxml2, binutils, libldap-2.4-2, openssl, zlib1g, g++, openssh-client, openssh-server, expect, libarchive13, rsync, libapr1, libaprutil1, python, libtbb2" CACHE STRING "")
-endif()
+SET_DEPENDENCIES ( "libboost-regex1.55.0, libicu52, libxslt1.1, libxml2, binutils, libldap-2.4-2, openssl, zlib1g, g++, openssh-client, openssh-server, expect, libarchive13, rsync, libapr1, libaprutil1, python, libtbb2" CPACK_DEBIAN_PACKAGE_DEPENDS )