Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use @style@ cmake escapes for the linux wrapper script

Browse Source 
This avoids cmake messing up shell variables
This commit is contained in:
Latif Khalifa
2014-05-27 17:35:37 +02:00
parent 1dbd913d9d
commit 8497ba1898
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
indra/cmake/BuildVersion.cmake
View File

@@ -56,6 +56,7 @@ if (LINUX)
configure_file( configure_file(
${CMAKE_SOURCE_DIR}/newview/linux_tools/wrapper.sh.in ${CMAKE_SOURCE_DIR}/newview/linux_tools/wrapper.sh.in
${CMAKE_SOURCE_DIR}/newview/linux_tools/wrapper.sh ${CMAKE_SOURCE_DIR}/newview/linux_tools/wrapper.sh
@ONLY
) )
endif (LINUX) endif (LINUX)

4
indra/newview/linux_tools/wrapper.sh.in
View File

@@ -64,7 +64,7 @@ if [ -n "$ASCENDED_DEVELOPER" ]; then
elif [ "$ASCENDED_DEVELOPER" = "2" ]; then elif [ "$ASCENDED_DEVELOPER" = "2" ]; then
export LL_WRAPPER='valgrind --smc-check=all --error-limit=no --log-file=secondlife.vg --leak-check=full --suppressions=/usr/lib/valgrind/glibc-2.5.supp --suppressions=secondlife-i686.supp' export LL_WRAPPER='valgrind --smc-check=all --error-limit=no --log-file=secondlife.vg --leak-check=full --suppressions=/usr/lib/valgrind/glibc-2.5.supp --suppressions=secondlife-i686.supp'
elif [ "$ASCENDED_DEVELOPER" = "3" ]; then elif [ "$ASCENDED_DEVELOPER" = "3" ]; then
export LL_WRAPPER='strace -f -ff -o ${VIEWER_BRANDING_ID}.strace' export LL_WRAPPER='strace -f -ff -o @VIEWER_BRANDING_ID@.strace'
fi fi
fi fi
@@ -142,7 +142,7 @@ if [ -n "$LL_TCMALLOC" ]; then
fi fi
fi fi
export VIEWER_BINARY='${VIEWER_BRANDING_ID}-do-not-run-directly' export VIEWER_BINARY='@VIEWER_BRANDING_ID@-do-not-run-directly'
BINARY_TYPE=$(expr match "$(file -b bin/$VIEWER_BINARY)" '\(.*executable\)' | sed -e 's/ / /g') BINARY_TYPE=$(expr match "$(file -b bin/$VIEWER_BINARY)" '\(.*executable\)' | sed -e 's/ / /g')
if [ "${BINARY_TYPE}" == "ELF 64-bit LSB executable" ]; then if [ "${BINARY_TYPE}" == "ELF 64-bit LSB executable" ]; then
SL_ENV+='LD_LIBRARY_PATH="`pwd`/lib64:`pwd`/lib32:$LD_LIBRARY_PATH"' SL_ENV+='LD_LIBRARY_PATH="`pwd`/lib64:`pwd`/lib32:$LD_LIBRARY_PATH"'