Merge branch 'master' into coalesced

SConstruct

@@ -43,6 +43,8 @@ print 'under certain conditions.'
 print 'Details can be found in the file \'gpl.txt\'.'
 print ''
 
+import os
+
 #
 # set possible variables
 #
@@ -178,8 +180,10 @@ if env['parallelization'] in ['cuda', 'mpi_with_cuda']:
   # set the directories for the CudaTool
   if 'cudaToolkitDir' in env:
     env['CUDA_TOOLKIT_PATH'] = env['cudaToolkitDir']
+    env.Append(RPATH=[os.path.join(env['cudaToolkitDir'], 'lib64')])
   if 'cudaSDKDir' in env:
     env['CUDA_SDK_PATH'] = env['cudaSDKDir']
+    env.Append(RPATH=[os.path.join(env['cudaSDKDir'], 'lib64')])
 
   env.Tool('CudaTool', toolpath = ['.'])