Skip to content

Commit e6b7099

Browse files
committed
Fix launch script wrapper commands.
If eval is used then LD_PRELOAD does not get set. Refs #10912
1 parent bdb2561 commit e6b7099

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

Code/Mantid/Build/CMake/LinuxPackageScripts.cmake

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,12 @@ set ( POST_UNINSTALL_FILE ${CMAKE_CURRENT_BINARY_DIR}/postrm )
9494

9595
if ( "${UNIX_DIST}" MATCHES "RedHatEnterprise" OR "${UNIX_DIST}" MATCHES "^Fedora" ) # RHEL/Fedora
9696
if ( "${UNIX_CODENAME}" MATCHES "Santiago" ) # el6
97-
set ( WRAPPER_COMMAND "scl enable mantidlibs" )
97+
set ( WRAPPER_PREFIX "scl enable mantidlibs \"" )
98+
set ( WRAPPER_POSTFIX "\"" )
9899
set ( EXTRA_LDPATH "/usr/lib64/paraview" )
99100
else()
100-
set ( WRAPPER_COMMAND "eval" )
101+
set ( WRAPPER_PREFIX "" )
102+
set ( WRAPPER_POSTFIX "" )
101103
endif()
102104

103105
if ( NOT MPI_BUILD )
@@ -116,7 +118,8 @@ if ( "${UNIX_DIST}" MATCHES "RedHatEnterprise" OR "${UNIX_DIST}" MATCHES "^Fedor
116118
set ( CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE ${POST_UNINSTALL_FILE} )
117119
endif()
118120
elseif ( "${UNIX_DIST}" MATCHES "Ubuntu" )
119-
set ( WRAPPER_COMMAND "eval" )
121+
set ( WRAPPER_PREFIX "" )
122+
set ( WRAPPER_POSTFIX "" )
120123

121124
if ( NOT MPI_BUILD )
122125
configure_file ( ${CMAKE_MODULE_PATH}/Packaging/deb/scripts/deb_pre_inst.in

Code/Mantid/Build/CMake/Packaging/launch_mantidplot.sh.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ else
2121
fi
2222

2323
# Launch
24-
LD_PRELOAD=${LOCAL_PRELOAD} TCMALLOC_RELEASE_RATE=${TCM_RELEASE} LD_LIBRARY_PATH=${LOCAL_LDPATH} @WRAPPER_COMMAND@ "$INSTALLDIR/@MANTIDPLOT_EXEC@ $*"
24+
LD_PRELOAD=${LOCAL_PRELOAD} TCMALLOC_RELEASE_RATE=${TCM_RELEASE} LD_LIBRARY_PATH=${LOCAL_LDPATH} @WRAPPER_PREFIX@$INSTALLDIR/@MANTIDPLOT_EXEC@ $*@WRAPPER_POSTFIX@

0 commit comments

Comments
 (0)