Refs #2632: Cmake target to put a script for patchelf

Code/Mantid/CMakeLists.txt

@@ -70,21 +70,7 @@ endif ()
 
 # For the build servers, use patchelf to remove the rpaths (linux only)
 find_package ( Patchelf )
-set ( RUN_PATCHELF OFF CACHE BOOL "Switch for running patchelf to strip rpaths from executables (Linux; this allows copying the binaries)")
-if ( RUN_PATCHELF )
-  MESSAGE ("RUN_PATCHELF is ON. Setting up patchelf command." )
-  add_custom_command( 
-	OUTPUT patch_all
-	POST_BUILD
-	COMMAND bash ${CMAKE_SOURCE_DIR}/TestingTools/patchelf_all.sh
-	WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-	COMMENT "Strips RPATH from all executables generated."
-	)
-  add_custom_target( run_patchelf DEPENDS patch_all)
-endif ()
-
-#	COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/TestingTools/patchelf_all.sh ${CMAKE_CURRENT_BINARY_DIR}
-#	COMMAND bash ${CMAKE_SOURCE_DIR}/TestingTools/patchelf_all.sh
+# set ( RUN_PATCHELF OFF CACHE BOOL "Switch for running patchelf to strip rpaths from executables (Linux; this allows copying the binaries)")
 
 
 

Code/Mantid/Framework/Algorithms/test/DivideTest.h

@@ -157,6 +157,14 @@ public:
     performTest(work_in1,work_in2);
   }
 
+  void test_1D_SingleValue_inPlace()
+  {
+    int nBins = 10;
+    MatrixWorkspace_sptr work_in1 = WorkspaceCreationHelper::Create1DWorkspaceConstant(nBins, 3.0, 3.0);
+    MatrixWorkspace_sptr work_in2 = WorkspaceCreationHelper::CreateWorkspaceSingleValue(6.0);
+    performTest(work_in1,work_in2, false /*not event out*/, 0.5, 0.1549, false, false, true /* do it in place */ ););
+  }
+
   void test_SingleValue_1D_failsIfDivide()
   {
     int nBins = 10;

Code/Mantid/Framework/CMakeLists.txt

@@ -136,4 +136,6 @@ if ( MAKE_VATES )
   set ( FRAMEWORK_LIBS ${FRAMEWORK_LIBS} MDDataObjects MDAlgorithms MDEvents)
 endif ()
 
-add_custom_target ( Framework DEPENDS ${FRAMEWORK_LIBS} )
+add_custom_target ( Framework DEPENDS ${FRAMEWORK_LIBS})
+
+

Code/Mantid/Framework/Kernel/CMakeLists.txt

@@ -262,3 +262,13 @@ add_custom_command ( TARGET Kernel POST_BUILD
                        ${CMAKE_CURRENT_BINARY_DIR}/Mantid.properties
                        ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}
 )
+
+# Copy a shell script for patchelf if it is found 
+if ( PATCHELF_FOUND )
+	add_custom_command ( TARGET Kernel POST_BUILD
+		             COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different 
+		              	${CMAKE_SOURCE_DIR}/TestingTools/patchelf_all.sh
+		               	${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}
+	)
+endif ()
+

Code/Mantid/TestingTools/patchelf_all.sh

+find . -name "*.so" -exec patchelf --set-rpath . {} \;
+find . -name "*Test" -exec patchelf --set-rpath . {} \;
+find . -name "MantidPlot" -exec patchelf --set-rpath . {} \;
+find . -name "WikiMaker" -exec patchelf --set-rpath . {} \;
+
+