Commit 4679e8bb authored by Lynn Garren's avatar Lynn Garren

make sure any paths are enclosed in quotes

parent a1e0b673
......@@ -2,6 +2,7 @@
2012-07-09 L. Garren <garren@fnal.gov>
* cmake/Modules: enclose CMAKE_COMMAND in quotes when inside execute_process
* test shell scripts: make sure any paths are enclosed in quotes
2012-06-25 L. Garren <garren@fnal.gov>
......
......@@ -2,5 +2,5 @@
# @configure_input@
./testEvaluator@EXEEXT@ < @srcdir@/testEvaluator.input \
| @DIFF_Q@ - @srcdir@/testEvaluator.output > /dev/null
./testEvaluator@EXEEXT@ < "@srcdir@/testEvaluator.input" \
| @DIFF_Q@ - "@srcdir@/testEvaluator.output" > /dev/null
......@@ -3,4 +3,4 @@
./testGenericFunctions@EXEEXT@ \
| @DIFF_Q@ - @srcdir@/testGenericFunctions.output > /dev/null
| @DIFF_Q@ - "@srcdir@/testGenericFunctions.output" > /dev/null
......@@ -2,5 +2,5 @@
# @configure_input@
./testBasicVector3D@EXEEXT@ < @srcdir@/testBasicVector3D.input \
| @DIFF_Q@ - @srcdir@/testBasicVector3D.output > /dev/null
./testBasicVector3D@EXEEXT@ < "@srcdir@/testBasicVector3D.input" \
| @DIFF_Q@ - "@srcdir@/testBasicVector3D.output" > /dev/null
......@@ -3,4 +3,4 @@
./testBug6740@EXEEXT@ \
| @DIFF_Q@ - @srcdir@/testBug6740.output > /dev/null
| @DIFF_Q@ - "@srcdir@/testBug6740.output" > /dev/null
......@@ -2,4 +2,4 @@
# @configure_input@
./testBug6176@EXEEXT@ \
| @DIFF_Q@ - @srcdir@/testBug6176.output > /dev/null
| @DIFF_Q@ - "@srcdir@/testBug6176.output" > /dev/null
......@@ -2,5 +2,5 @@
# @configure_input@
rm -f testInversion.cout
@builddir@/testInversion@EXEEXT@ > testInversion.cout
@DIFF_Q@ testInversion.cout @srcdir@/testInversion.output
"@builddir@/testInversion@EXEEXT@" > testInversion.cout
@DIFF_Q@ testInversion.cout "@srcdir@/testInversion.output"
......@@ -3,4 +3,4 @@
./testMatrix@EXEEXT@ \
| @DIFF_Q@ - @srcdir@/testMatrix.output > /dev/null
| @DIFF_Q@ - "@srcdir@/testMatrix.output" > /dev/null
......@@ -2,7 +2,7 @@
# @configure_input@
@builddir@/testRandDists@EXEEXT@ < @srcdir@/testRandDists.input \
"@builddir@/testRandDists@EXEEXT@" < "@srcdir@/testRandDists.input" \
| sed 's/e-00\([0-9]\)/e-0\1/g' \
| sed 's/e+00\([0-9]\)/e+0\1/g' \
| @DIFF_Q@ - @srcdir@/testRandDists.output > /dev/null
| @DIFF_Q@ - "@srcdir@/testRandDists.output" > /dev/null
......@@ -3,4 +3,4 @@
# testRandom has no comparison file
./testRandom@EXEEXT@ < @srcdir@/testRandom.input > testRandom.out
./testRandom@EXEEXT@ < "@srcdir@/testRandom.input" > testRandom.out
......@@ -2,5 +2,5 @@
# @configure_input@
./testVectorDists@EXEEXT@ < @srcdir@/testVectorDists.input \
| @DIFF_Q@ - @srcdir@/testVectorDists.output > /dev/null
./testVectorDists@EXEEXT@ < "@srcdir@/testVectorDists.input" \
| @DIFF_Q@ - "@srcdir@/testVectorDists.output" > /dev/null
#-------------------------------------------------------------
You MUST use cmake to build on a Windows machine.
You MUST use cmake and nmake to build on a Windows machine.
Work in a DOS window.
......
......@@ -2,5 +2,5 @@
# @configure_input@
./testLorentzVector@EXEEXT@ < @srcdir@/testLorentzVector.input \
| @DIFF_Q@ - @srcdir@/testLorentzVector.output > /dev/null
./testLorentzVector@EXEEXT@ < "@srcdir@/testLorentzVector.input" \
| @DIFF_Q@ - "@srcdir@/testLorentzVector.output" > /dev/null
......@@ -2,5 +2,5 @@
# @configure_input@
./testThreeVector@EXEEXT@ < @srcdir@/testThreeVector.input \
| @DIFF_Q@ - @srcdir@/testThreeVector.output > /dev/null
./testThreeVector@EXEEXT@ < "@srcdir@/testThreeVector.input" \
| @DIFF_Q@ - "@srcdir@/testThreeVector.output" > /dev/null
......@@ -85,15 +85,15 @@ macro(clhep_build_libclhep )
if( ${CMAKE_SYSTEM_NAME} MATCHES "Windows" )
# copy
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/clhep_static_symlink
"execute_process(COMMAND \"${CMAKE_COMMAND}\" -E copy ${CMAKE_STATIC_LIBRARY_PREFIX}CLHEP-${VERSION}${CMAKE_STATIC_LIBRARY_SUFFIX} ${CMAKE_STATIC_LIBRARY_PREFIX}CLHEP${CMAKE_STATIC_LIBRARY_SUFFIX} WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}/lib )" )
"execute_process(COMMAND \"${CMAKE_COMMAND}\" -E copy ${CMAKE_STATIC_LIBRARY_PREFIX}CLHEP-${VERSION}${CMAKE_STATIC_LIBRARY_SUFFIX} ${CMAKE_STATIC_LIBRARY_PREFIX}CLHEP${CMAKE_STATIC_LIBRARY_SUFFIX} WORKING_DIRECTORY \"${CMAKE_INSTALL_PREFIX}/lib\" )" )
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/clhep_shared_symlink
"execute_process(COMMAND \"${CMAKE_COMMAND}\" -E copy ${CMAKE_SHARED_LIBRARY_PREFIX}CLHEP-${VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX} ${CMAKE_SHARED_LIBRARY_PREFIX}CLHEP${CMAKE_SHARED_LIBRARY_SUFFIX} WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}/bin )" )
"execute_process(COMMAND \"${CMAKE_COMMAND}\" -E copy ${CMAKE_SHARED_LIBRARY_PREFIX}CLHEP-${VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX} ${CMAKE_SHARED_LIBRARY_PREFIX}CLHEP${CMAKE_SHARED_LIBRARY_SUFFIX} WORKING_DIRECTORY \"${CMAKE_INSTALL_PREFIX}/bin\" )" )
else()
# create the symbolic links
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/clhep_static_symlink
"execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink ${CMAKE_STATIC_LIBRARY_PREFIX}CLHEP-${VERSION}${CMAKE_STATIC_LIBRARY_SUFFIX} ${CMAKE_STATIC_LIBRARY_PREFIX}CLHEP${CMAKE_STATIC_LIBRARY_SUFFIX} WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}/lib )" )
"execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink ${CMAKE_STATIC_LIBRARY_PREFIX}CLHEP-${VERSION}${CMAKE_STATIC_LIBRARY_SUFFIX} ${CMAKE_STATIC_LIBRARY_PREFIX}CLHEP${CMAKE_STATIC_LIBRARY_SUFFIX} WORKING_DIRECTORY \"${CMAKE_INSTALL_PREFIX}/lib\" )" )
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/clhep_shared_symlink
"execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink ${CMAKE_SHARED_LIBRARY_PREFIX}CLHEP-${VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX} ${CMAKE_SHARED_LIBRARY_PREFIX}CLHEP${CMAKE_SHARED_LIBRARY_SUFFIX} WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}/lib )" )
"execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink ${CMAKE_SHARED_LIBRARY_PREFIX}CLHEP-${VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX} ${CMAKE_SHARED_LIBRARY_PREFIX}CLHEP${CMAKE_SHARED_LIBRARY_SUFFIX} WORKING_DIRECTORY \"${CMAKE_INSTALL_PREFIX}/lib\" )" )
endif()
INSTALL(SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/clhep_static_symlink )
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment