Merge branch 'master' into feature/10346_vesuvio_resolution_algorithm

Conflicts: Code/Mantid/Framework/PythonInterface/test/python/plugins/algorithms/CMakeLists.txt Refs #10346
mantidproject · Feb 6, 2015 · 832da2b · 832da2b
2 parents dff3da8 + b275b7e
commit 832da2b
Show file tree

Hide file tree

Showing 3,093 changed files with 614,075 additions and 503,735 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,14 +1,13 @@
-The [developer documentation](http://www.mantidproject.org/Category:Development) has information on how to participate in the mantid project as a developer. This document is meant to outline the steps for contributing to mantid without becomming a developer.
+The [developer documentation](http://www.mantidproject.org/Category:Development) has information on how to participate in the mantid project as a developer. This document is meant to outline the steps for contributing to mantid without becomming a developer. We aspire to have similar guidelines as [github](https://github.com/blog/1943-how-to-write-the-perfect-pull-request).
 
  1. [Fork](https://help.github.com/articles/fork-a-repo) the repository.
  2. Make changes as you see fit. Please still follow the guidelines for [running the unit tests](http://www.mantidproject.org/Running_the_unit_tests) and the [build servers](http://www.mantidproject.org/The_automated_build_process).
- 3. Before submitting pull requests email mantid-help@mantidproject.org, and a developer will set up a branch that you can submit pull requests to.
- 4. Submit a [pull request](https://help.github.com/articles/using-pull-requests) to this branch.
+ 4. Submit a [pull request](https://help.github.com/articles/using-pull-requests) to this branch. This is a start to the conversation.
+ 3. (Optional) email mantid-help@mantidproject.org requests to.
 
-
-Hints to make the integration of your changes easy:
+Hints to make the integration of your changes easy (and happen faster):
 - Keep your pull requests small
+- Some comments are part of the build server infrastructure (e.g. 'test this please')
 - Don't forget your unit tests
 - All algorithms need documentation, don't forget the .rst file
-- Contact us before creating the pull request
 - Don't take changes requests to change your code personally
diff --git a/Code/Mantid/Build/CMake/CommonSetup.cmake b/Code/Mantid/Build/CMake/CommonSetup.cmake
@@ -54,7 +54,7 @@ add_definitions ( -DBOOST_DATE_TIME_POSIX_TIME_STD_CONFIG )
 find_package ( Poco 1.4.2 REQUIRED )
 include_directories( SYSTEM ${POCO_INCLUDE_DIRS} )
 
-find_package ( Nexus 4.3.0 REQUIRED )
+find_package ( Nexus 4.3.1 REQUIRED )
 include_directories ( SYSTEM ${NEXUS_INCLUDE_DIR} )
 
 find_package ( MuParser REQUIRED )
@@ -242,7 +242,10 @@ endif ()
 if ( CMAKE_COMPILER_IS_GNUCXX )
   include ( GNUSetup )
 elseif ( "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" )
-  include ( GNUSetup )
+  # Remove once clang warnings have been fixed. 
+  if ( NOT APPLE)
+    include ( GNUSetup )
+  endif ()
 endif ()
 
 ###########################################################################

diff --git a/Code/Mantid/Build/CMake/DarwinSetup.cmake b/Code/Mantid/Build/CMake/DarwinSetup.cmake
@@ -160,7 +160,7 @@ install ( DIRECTORY ${PYQT4_PYTHONPATH}/uic DESTINATION ${BIN_DIR}/PyQt4 )
 file ( GLOB THIRDPARTY_PYTHON_PACKAGES ${CMAKE_LIBRARY_PATH}/Python/* )
 foreach ( PYPACKAGE ${THIRDPARTY_PYTHON_PACKAGES} )
   if ( IS_DIRECTORY ${PYPACKAGE} )
-    install ( DIRECTORY ${PYPACKAGE} DESTINATION ${BIN_DIR} )
+    install ( DIRECTORY ${PYPACKAGE} DESTINATION ${BIN_DIR} USE_SOURCE_PERMISSIONS )
   else()
     install ( FILES ${PYPACKAGE} DESTINATION ${BIN_DIR} )
   endif()

diff --git a/Code/Mantid/Build/CMake/FindPyUnitTest.cmake b/Code/Mantid/Build/CMake/FindPyUnitTest.cmake
@@ -30,8 +30,8 @@ macro ( PYUNITTEST_ADD_TEST _test_src_dir _testname_prefix )
                  COMMAND ${PYTHON_EXECUTABLE_DEBUG} -B ${_test_src_dir}/${_filename} )
       # Set the PYTHONPATH so that the built modules can be found
       set_tests_properties ( ${_pyunit_separate_name}_Debug PROPERTIES
-                             ENVIRONMENT "PYTHONPATH=${_module_dir}"
-                             WORKING_DIRECTORY ${_working_dir}
+                             ENVIRONMENT "PYTHONPATH=${_module_dir_debug}"
+                             WORKING_DIRECTORY ${_working_dir_debug}
                              TIMEOUT ${TESTING_TIMEOUT} )
       # Release
       add_test ( NAME ${_pyunit_separate_name} CONFIGURATIONS Release

diff --git a/Code/Mantid/Build/CMake/LinuxPackageScripts.cmake b/Code/Mantid/Build/CMake/LinuxPackageScripts.cmake
@@ -23,9 +23,19 @@ endif()
 set ( CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/${LIB_DIR};${CMAKE_INSTALL_PREFIX}/${PLUGINS_DIR};${CMAKE_INSTALL_PREFIX}/${PVPLUGINS_DIR} )
 
 ###########################################################################
-# LD_PRELOAD libraries
+# LD_PRELOAD TCMalloc
 ###########################################################################
-set ( EXTRA_LDPRELOAD_LIBS "${TCMALLOC_LIBRARIES}" )
+# User systems will only have the libraries and not the symbolic link
+# so we must set the preload to the versioned library. We will assume it is
+# in the same location as the system that the package was built on
+if ( TCMALLOC_LIBRARIES )
+  execute_process ( COMMAND readlink --no-newline --canonicalize-existing ${TCMALLOC_LIBRARIES}
+                    OUTPUT_VARIABLE TCMALLOC_PRELOAD
+                    RESULT_VARIABLE READLINK_RESULT )
+  if ( READLINK_RESULT EQUAL 1 )
+    message ( FATAL_ERROR "Unable to find real file that tcmalloc symlink, ${TCMALLOC_LIBRARIES}, points to." )
+  endif()
+endif()
 
 ###########################################################################
 # Environment scripts (profile.d)
@@ -84,10 +94,12 @@ set ( POST_UNINSTALL_FILE ${CMAKE_CURRENT_BINARY_DIR}/postrm )
 
 if ( "${UNIX_DIST}" MATCHES "RedHatEnterprise" OR "${UNIX_DIST}" MATCHES "^Fedora" ) # RHEL/Fedora
   if ( "${UNIX_CODENAME}" MATCHES "Santiago" ) # el6
-    set ( WRAPPER_COMMAND "scl enable mantidlibs" )
+    set ( WRAPPER_PREFIX "scl enable mantidlibs \"" )
+    set ( WRAPPER_POSTFIX "\"" )
     set ( EXTRA_LDPATH "/usr/lib64/paraview" )
   else()
-    set ( WRAPPER_COMMAND "eval" )
+    set ( WRAPPER_PREFIX "" )
+    set ( WRAPPER_POSTFIX "" )
   endif()
 
   if ( NOT MPI_BUILD )
@@ -97,7 +109,7 @@ if ( "${UNIX_DIST}" MATCHES "RedHatEnterprise" OR "${UNIX_DIST}" MATCHES "^Fedor
                      ${POST_INSTALL_FILE} @ONLY )
     configure_file ( ${CMAKE_MODULE_PATH}/Packaging/rpm/scripts/rpm_pre_uninstall.sh.in
                      ${PRE_UNINSTALL_FILE} @ONLY )
-    configure_file ( ${CMAKE_MODULE_PATH}/Packaging/rpm/scripts/rpm_post_install.sh.in
+    configure_file ( ${CMAKE_MODULE_PATH}/Packaging/rpm/scripts/rpm_post_uninstall.sh.in
                      ${POST_UNINSTALL_FILE} @ONLY )
     # CPack variables
     set ( CPACK_RPM_PRE_INSTALL_SCRIPT_FILE ${PRE_INSTALL_FILE} )
@@ -106,7 +118,8 @@ if ( "${UNIX_DIST}" MATCHES "RedHatEnterprise" OR "${UNIX_DIST}" MATCHES "^Fedor
     set ( CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE ${POST_UNINSTALL_FILE} )
   endif()
 elseif ( "${UNIX_DIST}" MATCHES "Ubuntu" )
-  set ( WRAPPER_COMMAND "eval" )
+  set ( WRAPPER_PREFIX "" )
+  set ( WRAPPER_POSTFIX "" )
 
   if ( NOT MPI_BUILD )
     configure_file ( ${CMAKE_MODULE_PATH}/Packaging/deb/scripts/deb_pre_inst.in

diff --git a/Code/Mantid/Build/CMake/Packaging/launch_mantidplot.sh.in b/Code/Mantid/Build/CMake/Packaging/launch_mantidplot.sh.in
@@ -9,7 +9,7 @@ SCRIPTFILE=$(readlink -f "$0")
 INSTALLDIR=$(echo $SCRIPTFILE | sed -r -e 's|^(.*)/(.*)$|\1|g') #.* is greedy and eats up until the final slash
 
 # Define extra libraries and load paths
-LOCAL_PRELOAD=$(readlink -f @EXTRA_LDPRELOAD_LIBS@)
+LOCAL_PRELOAD=@TCMALLOC_PRELOAD@
 if [ -n "${LD_PRELOAD}" ]; then
     LOCAL_PRELOAD=${LOCAL_PRELOAD}:${LD_PRELOAD}
 fi
@@ -21,4 +21,4 @@ else
 fi
 
 # Launch
-LD_PRELOAD=${LOCAL_PRELOAD} TCMALLOC_RELEASE_RATE=${TCM_RELEASE} LD_LIBRARY_PATH=${LOCAL_LDPATH} @WRAPPER_COMMAND@ "$INSTALLDIR/@MANTIDPLOT_EXEC@ $*" 
+LD_PRELOAD=${LOCAL_PRELOAD} TCMALLOC_RELEASE_RATE=${TCM_RELEASE} LD_LIBRARY_PATH=${LOCAL_LDPATH} @WRAPPER_PREFIX@$INSTALLDIR/@MANTIDPLOT_EXEC@ $*@WRAPPER_POSTFIX@
diff --git a/Code/Mantid/Build/CMake/Packaging/rpm/scripts/rpm_post_install.sh.in b/Code/Mantid/Build/CMake/Packaging/rpm/scripts/rpm_post_install.sh.in
@@ -6,17 +6,20 @@
 #
 ENVVARS_ON_INSTALL=@ENVVARS_ON_INSTALL_INT@
 
-if [ ! -e $RPM_INSTALL_PREFIX0/@BIN_DIR@/mantidplot ]; then
-  ln -s $RPM_INSTALL_PREFIX0/@BIN_DIR@/MantidPlot $RPM_INSTALL_PREFIX0/@BIN_DIR@/mantidplot
-fi
-
+# Create symbolic links
 if [ -f $RPM_INSTALL_PREFIX0/@BIN_DIR@/MantidPlot ]; then
-  mv $RPM_INSTALL_PREFIX0/@BIN_DIR@/MantidPlot $RPM_INSTALL_PREFIX0/@BIN_DIR@/MantidPlot_exe
-  ln -s $RPM_INSTALL_PREFIX0/@BIN_DIR@/launch_mantidplot.sh $RPM_INSTALL_PREFIX0/@BIN_DIR@/MantidPlot
+    mv $RPM_INSTALL_PREFIX0/@BIN_DIR@/MantidPlot $RPM_INSTALL_PREFIX0/@BIN_DIR@/MantidPlot_exe
+    if [ ! -s $RPM_INSTALL_PREFIX0/@BIN_DIR@/MantidPlot ]; then
+        ln -s $RPM_INSTALL_PREFIX0/@BIN_DIR@/launch_mantidplot.sh $RPM_INSTALL_PREFIX0/@BIN_DIR@/MantidPlot
+    fi
+    if [ ! -s $RPM_INSTALL_PREFIX0/@BIN_DIR@/mantidplot ]; then
+        ln -s $RPM_INSTALL_PREFIX0/@BIN_DIR@/launch_mantidplot.sh $RPM_INSTALL_PREFIX0/@BIN_DIR@/mantidplot
+    fi
 fi
 
+# Environment updates if required
 if [ ${ENVVARS_ON_INSTALL} -eq 1 ]; then
-  # Link profiles to /etc/profile.d
-  ln -s $RPM_INSTALL_PREFIX0/@ETC_DIR@/mantid.sh /etc/profile.d/mantid.sh
-  ln -s $RPM_INSTALL_PREFIX0/@ETC_DIR@/mantid.csh /etc/profile.d/mantid.csh
+    # Link profiles to /etc/profile.d
+    ln -s $RPM_INSTALL_PREFIX0/@ETC_DIR@/mantid.sh /etc/profile.d/mantid.sh
+    ln -s $RPM_INSTALL_PREFIX0/@ETC_DIR@/mantid.csh /etc/profile.d/mantid.csh
 fi
diff --git a/Code/Mantid/Build/CMake/Packaging/rpm/scripts/rpm_post_uninstall.sh.in b/Code/Mantid/Build/CMake/Packaging/rpm/scripts/rpm_post_uninstall.sh.in
@@ -4,6 +4,25 @@
 # If the installation directory is empty then it is removed
 #
 
+# Configured by CMake
+ENVVARS_ON_INSTALL=@ENVVARS_ON_INSTALL_INT@
+
+# Remove exe and links only if it looks like we were removed
+# and not upgraded. If launch_mantidplot.sh exists then package
+# has been upgraded and MantidPlot_exe replaced so don't touch anything
+if [ ! -e $RPM_INSTALL_PREFIX0/@BIN_DIR@/launch_mantidplot.sh  ]; then
+    rm $RPM_INSTALL_PREFIX0/@BIN_DIR@/MantidPlot_exe
+
+    if [ ${ENVVARS_ON_INSTALL} -eq 1 ]; then
+	if [ -h /etc/profile.d/mantid.sh ]; then
+	    rm /etc/profile.d/mantid.sh
+	fi
+	if [ -h /etc/profile.d/mantid.csh ]; then
+	    rm /etc/profile.d/mantid.csh
+	fi
+    fi
+fi
+
 # If the install prefix contains mantid then prune empty directories.
 # Begin extra cautious here just in case some has set the something like Prefix=/usr
 if echo \"$RPM_INSTALL_PREFIX0\" | grep -qi mantid; then

diff --git a/Code/Mantid/Build/CMake/Packaging/rpm/scripts/rpm_pre_install.sh.in b/Code/Mantid/Build/CMake/Packaging/rpm/scripts/rpm_pre_install.sh.in
@@ -6,8 +6,12 @@
 #
 ENVVARS_ON_INSTALL=@ENVVARS_ON_INSTALL_INT@
 
-if [  -h $RPM_INSTALL_PREFIX0/@BIN_DIR@/mantidplot ]; then
-  rm $RPM_INSTALL_PREFIX0/@BIN_DIR@/mantidplot
+# Remove links
+if [ -h $RPM_INSTALL_PREFIX0/@BIN_DIR@/mantidplot ]; then
+    rm $RPM_INSTALL_PREFIX0/@BIN_DIR@/mantidplot
+fi
+if [ -h $RPM_INSTALL_PREFIX0/@BIN_DIR@/Mantidplot ]; then
+    rm $RPM_INSTALL_PREFIX0/@BIN_DIR@/Mantidplot
 fi
 
 if [ ${ENVVARS_ON_INSTALL} -eq 1 ]; then

diff --git a/Code/Mantid/Build/CMake/Packaging/rpm/scripts/rpm_pre_uninstall.sh.in b/Code/Mantid/Build/CMake/Packaging/rpm/scripts/rpm_pre_uninstall.sh.in
@@ -1,25 +1,6 @@
 #!/bin/sh
 #
 # RPM pre-uninstall script
-# Remove links to mantidplot & /etc/profile.d
 #
 
-# Configured by CMake
-ENVVARS_ON_INSTALL=@ENVVARS_ON_INSTALL_INT@
-
-# Remove link and exe
-if [ -h $RPM_INSTALL_PREFIX0/@BIN_DIR@/mantidplot ]; then
-    rm $RPM_INSTALL_PREFIX0/@BIN_DIR@/mantidplot
-fi
-if [ -f $RPM_INSTALL_PREFIX0/@BIN_DIR@/MantidPlot_exe  ]; then
-    rm $RPM_INSTALL_PREFIX0/@BIN_DIR@/MantidPlot_exe
-fi
-
-if [ ${ENVVARS_ON_INSTALL} -eq 1 ]; then
-    if [ -h /etc/profile.d/mantid.sh ]; then
-	rm /etc/profile.d/mantid.sh
-    fi
-    if [ -h /etc/profile.d/mantid.csh ]; then
-	rm /etc/profile.d/mantid.csh
-    fi
-fi
+# Nothing needs to be done
diff --git a/Code/Mantid/Build/CMake/VersionNumber.cmake b/Code/Mantid/Build/CMake/VersionNumber.cmake
@@ -1,7 +1,7 @@
 # Set the version number here for MantidVersion and the package filenames
 
 set ( VERSION_MAJOR 3 )
-set ( VERSION_MINOR 2 )
+set ( VERSION_MINOR 3 )
 
 # UNCOMMENT the next 'set' line to 'force' the patch version number to
 # a value (instead of using the count coming out of 'git describe')

diff --git a/Code/Mantid/Build/Jenkins/buildscript b/Code/Mantid/Build/Jenkins/buildscript
@@ -15,28 +15,39 @@
 cmake --version
 echo "SHA1=${sha1}"
 
+if [[ ${JOB_NAME} == *clang* ]]; then
+  # Assuming we are using the clang compiler
+  echo "Using clang/llvm compiler."
+  clang --version
+  export CC=clang
+  export CXX=clang++
+  #check if CMakeCache.txt exists and if so that the cxx compiler is clang++
+  #only needed with incremental builds. Clean builds delete this directory in a later step. 
+  if [[ -e $WORKSPACE/build/CMakeCache.txt ]] && [[ ${JOB_NAME} != *clean* ]]; then
+    COMPILERFILEPATH=`grep 'CMAKE_CXX_COMPILER:FILEPATH' $WORKSPACE/build/CMakeCache.txt` 
+    if [[ $COMPILERFILEPATH != *clang++* ]]; then 
+      # Removing the build directory entirely guarantees clang is used.
+      rm -rf $WORKSPACE/build
+    fi
+  fi 
+fi
+
 ###############################################################################
-# OS X setup steps
-###############################################################################
-if [[ $(uname) == 'Darwin' ]]; then
-  if [[ ${JOB_NAME} == *clang* ]]; then
-    # Assuming we are using the clang compiler
-    echo "Using clang/llvm compiler."
-    clang --version
-  else
-    # Assuming we are using the Intel compiler
-    cd $WORKSPACE/Code
-    ./fetch_Third_Party.sh
-    cd $WORKSPACE
-    # Setup environment variables
-    source /opt/intel/bin/iccvars.sh intel64
-    export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$WORKSPACE/Code/Third_Party/lib/mac64:/Library/Frameworks
-    # Make sure we pick up the Intel compiler
-    export CC=icc
-    export CXX=icpc
-    echo "Using Intel compiler."
-    icpc --version
-  fi
+# OS X 10.8 setup steps
+###############################################################################
+if [[ $(uname) == 'Darwin' ]] && [[ ${JOB_NAME} != *clang* ]]; then
+  # Assuming we are using the Intel compiler
+  cd $WORKSPACE/Code
+  ./fetch_Third_Party.sh
+  cd $WORKSPACE
+  # Setup environment variables
+  source /opt/intel/bin/iccvars.sh intel64
+  export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$WORKSPACE/Code/Third_Party/lib/mac64:/Library/Frameworks
+  # Make sure we pick up the Intel compiler
+  export CC=icc
+  export CXX=icpc
+  echo "Using Intel compiler."
+  icpc --version
 fi
 
 ###############################################################################

diff --git a/Code/Mantid/Build/dev-packages/deb/mantid-developer/README b/Code/Mantid/Build/dev-packages/deb/mantid-developer/README
@@ -2,5 +2,5 @@ This directory contains the structure required to build the simple mantid-develo
 
 To build the package:
    * Switch to the directory containing this file
-   * Run "dpkg --build mantid-developer-1.2.2"
-   * A file called mantid-developer-1.2.2.deb will appear in the current directory.
+   * Run "dpkg --build mantid-developer-1.2.3"
+   * A file called mantid-developer-1.2.3.deb will appear in the current directory.
diff --git a/Code/Mantid/Build/dev-packages/deb/mantid-developer/mantid-developer-1.2.3/DEBIAN/control b/Code/Mantid/Build/dev-packages/deb/mantid-developer/mantid-developer-1.2.3/DEBIAN/control
@@ -0,0 +1,13 @@
+Package: mantid-developer
+Version: 1.2.3
+Section: main
+Priority: optional
+Architecture: all
+Depends: git, clang, cmake-qt-gui(>=2.8.12), qt4-qmake, qt4-dev-tools, libqt4-dbg, libpoco-dev(>=1.4.2), libboost-all-dev, libboost-dbg, libnexus0-dev, libgoogle-perftools-dev, libqwt5-qt4-dev, libqwtplot3d-qt4-dev, python-qt4-dev, libgsl0-dev, liboce-visualization-dev, libmuparser-dev, python-numpy, libssl-dev, libqscintilla2-dev, texlive,texlive-latex-extra, dvipng, libhdf4-dev, doxygen, python-sphinx, python-scipy, ipython-qtconsole (>=1.2.0), libhdf5-dev, libhdf4-dev, libpococrypto11-dbg, libpocodata11-dbg, libpocofoundation11-dbg, libpocomysql11-dbg, libpoconet11-dbg, libpoconetssl11-dbg, libpocoodbc11-dbg, libpocosqlite11-dbg, libpocoutil11-dbg, libpocoxml11-dbg, libpocozip11-dbg, python-qt4-dbg, qt4-default, ninja-build, libjsoncpp-dev, python-dateutil
+Installed-Size: 0
+Maintainer: Mantid Project <mantid-help@mantidproject.org>
+Description: Installs all packages required for a Mantid developer
+ A metapackage which requires all the dependencies and tools that are 
+ required for Mantid development. It works for Ubuntu version 14.04, 14.10
+ Some packages (poco) must be newer than thiose in the Ubuntu repository. Please 
+ follow instructions at http://www.mantidproject.org/Mantid_Prerequisites#Repositories
diff --git a/Code/Mantid/Build/dev-packages/rpm/mantid-developer/mantid-developer.spec b/Code/Mantid/Build/dev-packages/rpm/mantid-developer/mantid-developer.spec
@@ -1,5 +1,5 @@
 Name:           mantid-developer
-Version:        1.6
+Version:        1.7
 Release:        1%{?dist}
 Summary:        Meta Package to install dependencies for Mantid Development
 
@@ -9,7 +9,7 @@ License:        GPL
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %{?fc20:Requires: rpmfusion-nonfree-release}
-Requires: cmake-gui >= 2.8.5
+Requires: cmake-gui >= 2.8.12
 Requires: boost-devel
 %{?el6:Requires: epel-release}
 Requires: gperftools-devel
@@ -31,6 +31,7 @@ Requires: PyQt4-devel
 Requires: python-devel
 Requires: python-ipython >= 1.1
 Conflicts: python-ipython >= 2.0
+Requires: python-pip
 Requires: python-sphinx
 Requires: qscintilla-devel
 Requires: qt-devel >= 4.6

diff --git a/Code/Mantid/CMakeLists.txt b/Code/Mantid/CMakeLists.txt
@@ -185,7 +185,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,nexus-python,gsl,glibc,qwtplot3d-qt4,muParser,numpy" )
+      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" )
       # OCE
       set( CPACK_RPM_PACKAGE_REQUIRES "${CPACK_RPM_PACKAGE_REQUIRES},OCE-draw,OCE-foundation,OCE-modeling,OCE-ocaf,OCE-visualization")
       # Qwt is qwt5-qt4 in RHEL7
@@ -199,7 +199,7 @@ if ( ENABLE_CPACK )
       set ( CPACK_RPM_PACKAGE_REQUIRES "${CPACK_RPM_PACKAGE_REQUIRES},python-ipython >= 1.1.0" )
       # scipy & matplotlib
       set ( CPACK_RPM_PACKAGE_REQUIRES "${CPACK_RPM_PACKAGE_REQUIRES},scipy,python-matplotlib" )
-      set ( CPACK_RPM_PACKAGE_REQUIRES "${CPACK_RPM_PACKAGE_REQUIRES},mxml,hdf,hdf5" )
+      set ( CPACK_RPM_PACKAGE_REQUIRES "${CPACK_RPM_PACKAGE_REQUIRES},mxml,hdf,hdf5,jsoncpp" )
 
       if( "${UNIX_CODENAME}" MATCHES "Santiago" )
         # On RHEL6 we have to use an updated qscintilla to fix an auto complete bug
@@ -222,7 +222,7 @@ if ( ENABLE_CPACK )
                            "libboost-python${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION},"
                            "libnexus0 (>= 4.3),libgsl0ldbl,libqtcore4 (>= 4.2),libqtgui4 (>= 4.2),libqt4-opengl (>= 4.2),"
                            "libqt4-xml (>= 4.2),libqt4-svg (>= 4.2),libqt4-qt3support (>= 4.2),qt4-dev-tools,"
-                           "libqwt5-qt4,libqwtplot3d-qt4-0,python-numpy,python-sip,python-qt4" )
+                           "libqwt5-qt4,libqwtplot3d-qt4-0,python-numpy,python-sip,python-qt4,libjsoncpp0" )
         set ( PERFTOOLS_DEB_PACKAGE "libgoogle-perftools0 (>= 1.7)" )
         if( "${UNIX_CODENAME}" MATCHES "lucid" )
           list ( APPEND DEPENDS_LIST ",libqscintilla2-5,"