File tree Expand file tree Collapse file tree 2 files changed +7
-4
lines changed Expand file tree Collapse file tree 2 files changed +7
-4
lines changed Original file line number Diff line number Diff line change @@ -94,10 +94,12 @@ set ( POST_UNINSTALL_FILE ${CMAKE_CURRENT_BINARY_DIR}/postrm )
94
94
95
95
if ( "${UNIX_DIST} " MATCHES "RedHatEnterprise" OR "${UNIX_DIST} " MATCHES "^Fedora" ) # RHEL/Fedora
96
96
if ( "${UNIX_CODENAME} " MATCHES "Santiago" ) # el6
97
- set ( WRAPPER_COMMAND "scl enable mantidlibs" )
97
+ set ( WRAPPER_PREFIX "scl enable mantidlibs \" " )
98
+ set ( WRAPPER_POSTFIX "\" " )
98
99
set ( EXTRA_LDPATH "/usr/lib64/paraview" )
99
100
else ()
100
- set ( WRAPPER_COMMAND "eval" )
101
+ set ( WRAPPER_PREFIX "" )
102
+ set ( WRAPPER_POSTFIX "" )
101
103
endif ()
102
104
103
105
if ( NOT MPI_BUILD )
@@ -116,7 +118,8 @@ if ( "${UNIX_DIST}" MATCHES "RedHatEnterprise" OR "${UNIX_DIST}" MATCHES "^Fedor
116
118
set ( CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE ${POST_UNINSTALL_FILE} )
117
119
endif ()
118
120
elseif ( "${UNIX_DIST} " MATCHES "Ubuntu" )
119
- set ( WRAPPER_COMMAND "eval" )
121
+ set ( WRAPPER_PREFIX "" )
122
+ set ( WRAPPER_POSTFIX "" )
120
123
121
124
if ( NOT MPI_BUILD )
122
125
configure_file ( ${CMAKE_MODULE_PATH} /Packaging/deb/scripts/deb_pre_inst.in
Original file line number Diff line number Diff line change 21
21
fi
22
22
23
23
# 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@
You can’t perform that action at this time.
0 commit comments