Skip to content

GitLab

Commit 7deda0d4 authored by Lynn Garren's avatar Lynn Garren
Browse files

changes for Visual C++

parent aaa08fcf
Hide whitespace changes
Inline Side-by-side
Vector/INSTALL
View file @ 7deda0d4
......@@ -11,6 +11,11 @@ cd <build_directory>
<source_code_direcotry>/configure --prefix=<install_dir>
(Note that files will be installed under /usr/local if you do not
specify a prefix.)
To use Visual C++:
<source_code_direcotry>/configure --prefix=<install_dir> CXX=cl CC=cl
(You must specify both CXX and CL or configure will attempt to use
gcc/g++ for the unspecified variable. Also, do not use
environmental varialbles.)
make
(Build temporary copies of libraries and executables.)
make check
......
Vector/Makefile.am
View file @ 7deda0d4
......@@ -20,6 +20,7 @@ all-local: $(top_builddir)/CLHEP
# abs_ => absolute path
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
COPY_P = @COPY_P@
$(top_builddir)/CLHEP:
mkdir $(top_builddir)/CLHEP;
......@@ -28,9 +29,9 @@ $(top_builddir)/CLHEP:
if test -d $(abs_top_srcdir)/../"$$pkg"/"$$pkg"; then \
(cd $(abs_top_builddir)/CLHEP; mkdir $$pkg; cd $$pkg; \
hdrs=`ls $(abs_top_srcdir)/../$$pkg/$$pkg`; \
for hdr in $$hdrs; do $(LN_S) $(abs_top_srcdir)/../$$pkg/$$pkg/$$hdr $$hdr; done; \
if test -f $(abs_top_builddir)/../"$$pkg"/"$$pkg"/defs.h; then $(LN_S) $(abs_top_builddir)/../$$pkg/$$pkg/defs.h defs.h; fi; \
if test -f $(abs_top_builddir)/"$$pkg"/defs.h && test ! -e defs.h ; then $(LN_S) $(abs_top_builddir)/$$pkg/defs.h defs.h; fi); \
for hdr in $$hdrs; do $(COPY_P) $(abs_top_srcdir)/../$$pkg/$$pkg/$$hdr $$hdr; done; \
if test -f $(abs_top_builddir)/../"$$pkg"/"$$pkg"/defs.h; then $(COPY_P) $(abs_top_builddir)/../$$pkg/$$pkg/defs.h defs.h; fi; \
if test -f $(abs_top_builddir)/"$$pkg"/defs.h && test ! -e defs.h ; then $(COPY_P) $(abs_top_builddir)/$$pkg/defs.h defs.h; fi); \
fi; done
cd $(abs_top_builddir); \
if test -n "$(CLHEPSOURCE_DIR)" && test -d $(CLHEPSOURCE_DIR)/CLHEP; then \
......@@ -39,7 +40,7 @@ $(top_builddir)/CLHEP:
if test -d $(CLHEPSOURCE_DIR)/CLHEP/"$$pkg"/"$$pkg" && test ! -d "$$pkg"; then \
(mkdir $$pkg; cd $$pkg; \
hdrs=`ls $(CLHEPSOURCE_DIR)/CLHEP/$$pkg/$$pkg`; \
for hdr in $$hdrs; do $(LN_S) $(CLHEPSOURCE_DIR)/CLHEP/$$pkg/$$pkg/$$hdr $$hdr; done); \
for hdr in $$hdrs; do $(COPY_P) $(CLHEPSOURCE_DIR)/CLHEP/$$pkg/$$pkg/$$hdr $$hdr; done); \
fi; done); fi
cd $(abs_top_builddir); \
if test -n "$(CLHEP_DIR)" && test -d $(CLHEP_DIR)/CLHEP; then \
......@@ -48,7 +49,7 @@ $(top_builddir)/CLHEP:
if test -d $(CLHEP_DIR)/CLHEP/"$$pkg"/"$$pkg" && test ! -d "$$pkg"; then \
(mkdir $$pkg; cd $$pkg; \
hdrs=`ls $(CLHEP_DIR)/CLHEP/$$pkg/$$pkg`; \
for hdr in $$hdrs; do $(LN_S) $(CLHEP_DIR)/CLHEP/$$pkg/$$pkg/$$hdr $$hdr; done); \
for hdr in $$hdrs; do $(COPY_P) $(CLHEP_DIR)/CLHEP/$$pkg/$$pkg/$$hdr $$hdr; done); \
fi; done); fi
docs:
......
Vector/configure.in
View file @ 7deda0d4
......@@ -55,6 +55,7 @@ AC_SUBST(Vector_CPPFLAGS)
AC_SUBST(Vector_LIBS)
AC_SUBST(Vector_LDFLAGS)
AC_SUBST(COPY_P)
# ----------------------------------------------------------------------
# Supply boilerplate for Vector/defs.h source header:
......@@ -111,7 +112,7 @@ AH_BOTTOM([#endif // VECTOR_DEFS_H])
# ----------------------------------------------------------------------
# Locate a C++ compiler:
AC_PROG_CXX(g++ c++ aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC gpp)
AC_PROG_CXX(cl g++ c++ aCC CC cxx cc++ FCC KCC RCC xlC_r xlC gpp)
# Use it hereinafter:
AC_LANG(C++)
......@@ -123,64 +124,64 @@ AC_REQUIRE_CPP
case "$target" in
*-*-win32*)
case "$CXX" in
cl) CXXFLAGS="-DWIN32 -O -GX -GR -MD";;
g++) CXXFLAGS="-O";;
c++) CXXFLAGS="-O";;
cl) CXXFLAGS="-DWIN32 -O -GX -GR -MD";COPY_P="copy -p";;
g++) CXXFLAGS="-O";COPY_P="copy -p";;
c++) CXXFLAGS="-O";COPY_P="copy -p";;
*) echo UNEXPECTED CHOICE OF C++ COMPILER: $CXX
esac;;
*-*-cygwin*)
case "$CXX" in
cl) CXXFLAGS="-DWIN32 -O -GX -GR -MD";;
g++) CXXFLAGS="-O -ansi -pedantic -Wall";;
c++) CXXFLAGS="-O -ansi -pedantic -Wall";;
cl) CXXFLAGS="-DWIN32 -O -GX -GR -MD";COPY_P="cp -p";;
g++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";;
c++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";;
*) echo UNEXPECTED CHOICE OF C++ COMPILER: $CXX
esac;;
*-*-solaris*)
case "$CXX" in
CC) CXXFLAGS="-O -mt";;
g++) CXXFLAGS="-O -ansi -pedantic -Wall";;
c++) CXXFLAGS="-O -ansi -pedantic -Wall";;
CC) CXXFLAGS="-O -mt";COPY_P="cp -p";;
g++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";;
c++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";;
*) echo UNEXPECTED CHOICE OF C++ COMPILER: $CXX
esac;;
*-*-linux*)
case "$CXX" in
g++) CXXFLAGS="-O -ansi -pedantic -Wall -D_GNU_SOURCE";;
c++) CXXFLAGS="-O -ansi -pedantic -Wall -D_GNU_SOURCE";;
g++) CXXFLAGS="-O -ansi -pedantic -Wall -D_GNU_SOURCE";COPY_P="cp -p";;
c++) CXXFLAGS="-O -ansi -pedantic -Wall -D_GNU_SOURCE";COPY_P="cp -p";;
*) echo UNEXPECTED CHOICE OF C++ COMPILER: $CXX
esac;;
alpha*-dec-osf*)
case "$CXX" in
cxx) CXXFLAGS="-O -std strict_ansi -timplicit_local";;
g++) CXXFLAGS="-O -ansi -pedantic -Wall";;
c++) CXXFLAGS="-O -ansi -pedantic -Wall";;
cxx) CXXFLAGS="-O -std strict_ansi -timplicit_local";COPY_P="cp -p";;
g++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";;
c++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";;
*) echo UNEXPECTED CHOICE OF C++ COMPILER: $CXX
esac;;
*-*-hpux*)
case "$CXX" in
aCC) CXXFLAGS="-O -Aa +DAportable +Onolimit";;
CC) CXXFLAGS="+O3 +DAportable +a1 -z -pta +Onolimit";;
g++) CXXFLAGS="-O -ansi -pedantic -Wall";;
c++) CXXFLAGS="-O -ansi -pedantic -Wall";;
aCC) CXXFLAGS="-O -Aa +DAportable +Onolimit";COPY_P="cp -p";;
CC) CXXFLAGS="+O3 +DAportable +a1 -z -pta +Onolimit";COPY_P="cp -p";;
g++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";;
c++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";;
*) echo UNEXPECTED CHOICE OF C++ COMPILER: $CXX
esac;;
*-*-aix*)
case "$CXX" in
xlC) CXXFLAGS="-O3 -qtwolink -+";;
g++) CXXFLAGS="-O -ansi -pedantic -Wall";;
c++) CXXFLAGS="-O -ansi -pedantic -Wall";;
xlC) CXXFLAGS="-O3 -qtwolink -+";COPY_P="cp -p";;
g++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";;
c++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";;
*) echo UNEXPECTED CHOICE OF C++ COMPILER: $CXX
esac;;
*-*-irix*)
case "$CXX" in
CC) CXXFLAGS="-O -OPT:Olimit=0 -pta";;
g++) CXXFLAGS="-O -ansi -pedantic -Wall";;
c++) CXXFLAGS="-O -ansi -pedantic -Wall";;
CC) CXXFLAGS="-O -OPT:Olimit=0 -pta";COPY_P="cp -p";;
g++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";;
c++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";;
*) echo UNEXPECTED CHOICE OF C++ COMPILER: $CXX
esac;;
powerpc-apple-darwin*)
case "$CXX" in
g++) CXXFLAGS="-O -ansi -pedantic -Wall";;
c++) CXXFLAGS="-O -ansi -pedantic -Wall";;
g++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";;
c++) CXXFLAGS="-O -ansi -pedantic -Wall";COPY_P="cp -p";;
*) echo UNEXPECTED CHOICE OF C++ COMPILER: $CXX
esac;;
esac
......
Supports Markdown
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