Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
CLHEP
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
CLHEP
CLHEP
Commits
148cb0f2
Commit
148cb0f2
authored
17 years ago
by
Lynn Garren
Browse files
Options
Downloads
Patches
Plain Diff
fix for Visual C++
parent
b748f830
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Vector/test/Makefile.am
+25
-2
25 additions, 2 deletions
Vector/test/Makefile.am
with
25 additions
and
2 deletions
Vector/test/Makefile.am
+
25
−
2
View file @
148cb0f2
...
@@ -9,17 +9,23 @@ INCLUDES = -I$(top_builddir)/
...
@@ -9,17 +9,23 @@ INCLUDES = -I$(top_builddir)/
# libraries to link, and whence
# libraries to link, and whence
if
BUILD_STATIC
if
BUILD_STATIC
LDADD
=
$(
top_builddir
)
/src/libCLHEP-@PACKAGE@-@VERSION@.a
LDADD
=
$(
top_builddir
)
/src/libCLHEP-@PACKAGE@-@VERSION@.a
OUTFLAG
=
-o
$@
else
else
if
BUILD_VISUAL
if
BUILD_VISUAL
LDADD
=
$(
top_builddir
)
/src/CLHEP-@PACKAGE@-@VERSION@.
$(
SHEXT
)
LDADD
=
$(
top_builddir
)
/src/CLHEP-@PACKAGE@-@VERSION@.
$(
SHEXT
)
CXXLINK
=
$(
CXXLD
)
$(
AM_CXXFLAGS
)
$(
CXXFLAGS
)
$(
AM_LDFLAGS
)
$(
LDFLAGS
)
/Fo
$@
OUTFLAG
=
/Fo
$@
else
else
LIBS
+=
$(
MY_LD
)$(
top_builddir
)
/src
LIBS
+=
$(
MY_LD
)$(
top_builddir
)
/src
LDADD
=
$(
top_builddir
)
/src/libCLHEP-@PACKAGE@-@VERSION@.
$(
SHEXT
)
LDADD
=
$(
top_builddir
)
/src/libCLHEP-@PACKAGE@-@VERSION@.
$(
SHEXT
)
CXXLINK
=
$(
CXXLD
)
$(
AM_CXXFLAGS
)
$(
CXXFLAGS
)
$(
AM_LDFLAGS
)
$(
LDFLAGS
)
-o
$@
OUTFLAG
=
-o
$@
endif
endif
endif
endif
# normally, CXXLINK is supplied by automake, but we need to use /Fo instead
# of -o when compiling with Visual C++
CXXLINK
=
$(
CXXLD
)
$(
AM_CXXFLAGS
)
$(
CXXFLAGS
)
$(
AM_LDFLAGS
)
$(
LDFLAGS
)
\
$(
OUTFLAG
)
# Identify executables needed during testing:
# Identify executables needed during testing:
check_PROGRAMS
=
\
check_PROGRAMS
=
\
testThreeVector testLorentzVector testRotation testSubscripts
testThreeVector testLorentzVector testRotation testSubscripts
...
@@ -48,3 +54,20 @@ EXTRA_DIST = \
...
@@ -48,3 +54,20 @@ EXTRA_DIST = \
# Identify generated file(s) to be removed when 'make clean' is requested:
# Identify generated file(s) to be removed when 'make clean' is requested:
CLEANFILES
=
testThreeVector.sh testLorentzVector.sh testRotation.sh testSubscripts.sh
CLEANFILES
=
testThreeVector.sh testLorentzVector.sh testRotation.sh testSubscripts.sh
# supply our own suffix rule
.cc.obj
:
if
BUILD_VISUAL
# $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c $(OUTFLAG) `$(CYGPATH_W) '$<'`
# mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
source
=
'$<'
object
=
'$@'
libtool
=
no
\
DEPDIR
=
$(
DEPDIR
)
$(
CXXDEPMODE
)
$(
depcomp
)
\
$(
CXXCOMPILE
)
-c
$(
OUTFLAG
)
`
$(
CYGPATH_W
)
'$<'
`
else
if
$(CXXCOMPILE)
-MT
$@
-MD
-MP
-MF
"$(DEPDIR)/$*.Tpo"
-c
$(OUTFLAG)
`$(CYGPATH_W)
'$<'
`;
\
then
mv
-f
"$(DEPDIR)/$*.Tpo"
"$(DEPDIR)/$*.Po"
;
else
rm
-f
"$(DEPDIR)/$*.Tpo"
;
exit
1;
fi
# source='$<' object='$@' libtool=no \
# DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
# $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
endif
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment