Make sure the Vates section of FixBundle.cmake is run. Refs #5379

CPack doesn't seem to know about some of CMake's variables. Using the
variable directy now.

Code/Mantid/MantidPlot/FixBundle.cmake.in

@@ -98,7 +98,18 @@ endfunction()
 ####################################################
 # Fix up ParaView plugins (if we are building Vates)
 ####################################################
-if( MAKE_VATES )
+# Allow include to do cmake_policy push/pops:
+# Makes the below behaviour work
+if(COMMAND CMAKE_POLICY)
+  cmake_policy(SET CMP0011 NEW)
+endif(COMMAND CMAKE_POLICY)
+# Allows ON to be treated directly in an if() statement
+if(COMMAND CMAKE_POLICY) 
+  cmake_policy(SET CMP0012 NEW)
+endif(COMMAND CMAKE_POLICY)
+
+# For some reason the MAKE_VATES flag is not defined when running this from cpack
+if( @MAKE_VATES@ )
   message( "Fixing up ParaView plugins to point at @PARAVIEW_APP_LIB_DIR@" )
   set ( paraview_app_libs "@PARAVIEW_APP_LIB_DIR@" )