diff --git a/CMakeLists.txt b/CMakeLists.txt index 61b7afc3852b42eab3da83fb0d2dde3007047c86..b3be1419fcdaa1f39c31df31196b141a176bedd4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -251,7 +251,7 @@ if ( ENABLE_CPACK ) message ( STATUS " CPACK_PACKAGE_FILE_NAME = ${CPACK_PACKAGE_FILE_NAME}" ) # rhel requirements - set ( CPACK_RPM_PACKAGE_REQUIRES "boost >= 1.34.1,qt4 >= 4.2,nexus >= 4.3.1,nexus-python >= 4.3.1,gsl,glibc,qwtplot3d-qt4,muParser,numpy" ) + set ( CPACK_RPM_PACKAGE_REQUIRES "qt4 >= 4.2,nexus >= 4.3.1,nexus-python >= 4.3.1,gsl,glibc,qwtplot3d-qt4,muParser,numpy" ) # OCE set( CPACK_RPM_PACKAGE_REQUIRES "${CPACK_RPM_PACKAGE_REQUIRES},OCE-draw,OCE-foundation,OCE-modeling,OCE-ocaf,OCE-visualization") 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" ) @@ -262,11 +262,11 @@ if ( ENABLE_CPACK ) if( "${UNIX_CODENAME}" MATCHES "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" ) + set ( CPACK_RPM_PACKAGE_REQUIRES "${CPACK_RPM_PACKAGE_REQUIRES} qscintilla >= 2.4.6, boost148" ) # On RHEL6 we are using SCL packages for Qt set ( CPACK_RPM_PACKAGE_REQUIRES "${CPACK_RPM_PACKAGE_REQUIRES},scl-utils,mantidlibs34,mantidlibs34-runtime,mantidlibs34-qt,mantidlibs34-qt-x11,mantidlibs34-qt-webkit,mantidlibs34-qwt5-qt4" ) else() - set ( CPACK_RPM_PACKAGE_REQUIRES "${CPACK_RPM_PACKAGE_REQUIRES} qscintilla,qwt5-qt4,python-matplotlib-qt4" ) + set ( CPACK_RPM_PACKAGE_REQUIRES "${CPACK_RPM_PACKAGE_REQUIRES} qscintilla,qwt5-qt4,python-matplotlib-qt4,boost >= 1.48.0" ) endif() # Add software collections for RHEL diff --git a/buildconfig/CMake/CommonSetup.cmake b/buildconfig/CMake/CommonSetup.cmake index b28cb78ff216655c68f31be092ae93c14acdad64..e687e43311fae07e7fbc6f760060df069b412e79 100644 --- a/buildconfig/CMake/CommonSetup.cmake +++ b/buildconfig/CMake/CommonSetup.cmake @@ -40,7 +40,7 @@ set ( TESTING_TIMEOUT 300 CACHE INTEGER ########################################################################### set ( Boost_NO_BOOST_CMAKE TRUE ) -find_package ( Boost REQUIRED date_time regex ) +find_package ( Boost 1.48.0 REQUIRED date_time regex ) include_directories( SYSTEM ${Boost_INCLUDE_DIRS} ) add_definitions ( -DBOOST_ALL_DYN_LINK -DBOOST_ALL_NO_LIB ) # Need this defined globally for our log time values diff --git a/buildconfig/dev-packages/rpm/mantid-developer/mantid-developer.spec b/buildconfig/dev-packages/rpm/mantid-developer/mantid-developer.spec index ff6ebba3a78b953e293d1e2f8866e7597d6dd0fe..2b6a1c558075b21e735531895b486cfc634408b2 100644 --- a/buildconfig/dev-packages/rpm/mantid-developer/mantid-developer.spec +++ b/buildconfig/dev-packages/rpm/mantid-developer/mantid-developer.spec @@ -11,8 +11,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %{?fc20:Requires: rpmfusion-nonfree-release} Requires: clang Requires: cmake-gui >= 2.8.12 -Requires: boost-devel %{?el6:Requires: epel-release} +%if 0%{?el6} +Requires: boost148-devel +%else +Requires: boost-devel +%endif Requires: doxygen Requires: gperftools-devel Requires: gperftools-libs