Add various dependencies to RPM. refs #6315

mantidproject · Apr 26, 2013 · bf4e3fa · bf4e3fa
1 parent 20677de
commit bf4e3fa
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/Code/Mantid/CMakeLists.txt b/Code/Mantid/CMakeLists.txt
@@ -23,11 +23,6 @@ set ( CPACK_PACKAGE_NAME "mantid${CPACK_PACKAGE_SUFFIX}" )
 ###########################################################################
 find_package ( Qt4 COMPONENTS QtCore QtGui QtOpenGL QtXml QtSvg Qt3Support REQUIRED )
 
-###########################################################################
-# Set ParaView information since later items depend on it
-###########################################################################
-include ( ParaViewSetup )
-
 ###########################################################################
 # Set paths to Third_Party for Windows builds
 ###########################################################################
@@ -183,13 +178,22 @@ if ( ENABLE_CPACK )
       set ( CPACK_RPM_PACKAGE_REQUIRES "${CPACK_RPM_PACKAGE_REQUIRES},poco-crypto,poco-data,poco-mysql,poco-sqlite,poco-odbc,poco-util,poco-xml,poco-zip,poco-net,poco-netssl,poco-foundation,PyQt4,sip" )
       # scipy & matplotlib (ipython is too low a version to be used)
       set ( CPACK_RPM_PACKAGE_REQUIRES "${CPACK_RPM_PACKAGE_REQUIRES},scipy,python-matplotlib" )
-      # On RHEL6 we have to use an updated qscintilla to fix an auto complete bug
+      set ( CPACK_RPM_PACKAGE_REQUIRES "${CPACK_RPM_PACKAGE_REQUIRES},mxml,hdf,hdf5" )
+
       if( ${UNIX_CODENAME} STREQUAL "Santiago" )
+        # On RHEL6 we have to use an updated qscintilla to fix an auto complete bug
         set ( CPACK_RPM_PACKAGE_REQUIRES "${CPACK_RPM_PACKAGE_REQUIRES} qscintilla >= 2.4.6" )
+        # On RHEL6 we are using SCL packages for Qt
+        set ( CPACK_RPM_PACKAGE_REQUIRES "${CPACK_RPM_PACKAGE_REQUIRES},scl-utils,mantidlibs,mantidlibs-runtime,mantidlibs-qt" )
       else()  
         set ( CPACK_RPM_PACKAGE_REQUIRES "${CPACK_RPM_PACKAGE_REQUIRES} qscintilla" )
       endif()
 
+      # Add software collections for RHEL
+      if (  ${UNIX_CODENAME} STREQUAL "Santiago" )
+        set ( CPACK_RPM_PACKAGE_REQUIRES "${CPACK_RPM_PACKAGE_REQUIRES} scl-utils" )
+      endif()
+
       # qt assistant is in different places in every distro
       if ( ${UNIX_DIST} MATCHES "RedHatEnterprise" )
         set ( CPACK_RPM_PACKAGE_REQUIRES "${CPACK_RPM_PACKAGE_REQUIRES} qt4-x11" )