Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
CLHEP
CLHEP
Commits
4679e8bb
Commit
4679e8bb
authored
Jul 09, 2012
by
Lynn Garren
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
make sure any paths are enclosed in quotes
parent
a1e0b673
Changes
15
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
25 additions
and
24 deletions
+25
-24
ChangeLog
ChangeLog
+1
-0
Evaluator/test/testEvaluator.sh.in
Evaluator/test/testEvaluator.sh.in
+2
-2
GenericFunctions/test/testGenericFunctions.sh.in
GenericFunctions/test/testGenericFunctions.sh.in
+1
-1
Geometry/test/testBasicVector3D.sh.in
Geometry/test/testBasicVector3D.sh.in
+2
-2
Geometry/test/testBug6740.sh.in
Geometry/test/testBug6740.sh.in
+1
-1
Matrix/test/testBug6176.sh.in
Matrix/test/testBug6176.sh.in
+1
-1
Matrix/test/testInversion.sh.in
Matrix/test/testInversion.sh.in
+2
-2
Matrix/test/testMatrix.sh.in
Matrix/test/testMatrix.sh.in
+1
-1
Random/test/testRandDists.sh.in
Random/test/testRandDists.sh.in
+2
-2
Random/test/testRandom.sh.in
Random/test/testRandom.sh.in
+1
-1
RandomObjects/test/testVectorDists.sh.in
RandomObjects/test/testVectorDists.sh.in
+2
-2
ReadMe.win
ReadMe.win
+1
-1
Vector/test/testLorentzVector.sh.in
Vector/test/testLorentzVector.sh.in
+2
-2
Vector/test/testThreeVector.sh.in
Vector/test/testThreeVector.sh.in
+2
-2
cmake/Modules/ClhepBuildLibrary.cmake
cmake/Modules/ClhepBuildLibrary.cmake
+4
-4
No files found.
ChangeLog
View file @
4679e8bb
...
...
@@ -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>
...
...
Evaluator/test/testEvaluator.sh.in
View file @
4679e8bb
...
...
@@ -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
GenericFunctions/test/testGenericFunctions.sh.in
View file @
4679e8bb
...
...
@@ -3,4 +3,4 @@
./testGenericFunctions@EXEEXT@
\
| @DIFF_Q@ - @srcdir@/testGenericFunctions.output
>
/dev/null
| @DIFF_Q@ -
"
@srcdir@/testGenericFunctions.output
"
>
/dev/null
Geometry/test/testBasicVector3D.sh.in
View file @
4679e8bb
...
...
@@ -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
Geometry/test/testBug6740.sh.in
View file @
4679e8bb
...
...
@@ -3,4 +3,4 @@
./testBug6740@EXEEXT@
\
| @DIFF_Q@ - @srcdir@/testBug6740.output
>
/dev/null
| @DIFF_Q@ -
"
@srcdir@/testBug6740.output
"
>
/dev/null
Matrix/test/testBug6176.sh.in
View file @
4679e8bb
...
...
@@ -2,4 +2,4 @@
# @configure_input@
./testBug6176@EXEEXT@
\
| @DIFF_Q@ - @srcdir@/testBug6176.output
>
/dev/null
| @DIFF_Q@ -
"
@srcdir@/testBug6176.output
"
>
/dev/null
Matrix/test/testInversion.sh.in
View file @
4679e8bb
...
...
@@ -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
"
Matrix/test/testMatrix.sh.in
View file @
4679e8bb
...
...
@@ -3,4 +3,4 @@
./testMatrix@EXEEXT@
\
| @DIFF_Q@ - @srcdir@/testMatrix.output
>
/dev/null
| @DIFF_Q@ -
"
@srcdir@/testMatrix.output
"
>
/dev/null
Random/test/testRandDists.sh.in
View file @
4679e8bb
...
...
@@ -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
Random/test/testRandom.sh.in
View file @
4679e8bb
...
...
@@ -3,4 +3,4 @@
# testRandom has no comparison file
./testRandom@EXEEXT@ < @srcdir@/testRandom.input
>
testRandom.out
./testRandom@EXEEXT@ <
"
@srcdir@/testRandom.input
"
>
testRandom.out
RandomObjects/test/testVectorDists.sh.in
View file @
4679e8bb
...
...
@@ -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
ReadMe.win
View file @
4679e8bb
#-------------------------------------------------------------
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.
...
...
Vector/test/testLorentzVector.sh.in
View file @
4679e8bb
...
...
@@ -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
Vector/test/testThreeVector.sh.in
View file @
4679e8bb
...
...
@@ -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
cmake/Modules/ClhepBuildLibrary.cmake
View file @
4679e8bb
...
...
@@ -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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment