1 added + 5 modified, total 6 files
slic
diff -u -r1.39 -r1.40
--- GNUmakefile 17 Dec 2007 21:11:58 -0000 1.39
+++ GNUmakefile 10 Apr 2008 20:33:28 -0000 1.40
@@ -1,4 +1,4 @@
-# $Header: /cvs/lcd/slic/GNUmakefile,v 1.39 2007/12/17 21:11:58 jeremy Exp $
+# $Header: /cvs/lcd/slic/GNUmakefile,v 1.40 2008/04/10 20:33:28 jeremy Exp $
#
# Makefile for SLIC simulation package based on examples GNUmakefile by G. Cosmo.
#
@@ -34,6 +34,9 @@
# G4 arch include
include $(G4INSTALL)/config/architecture.gmk
+# HepPDT
+include $(MAKEINCLUDES)/heppdt.gmk
+
# LCDD
include $(MAKEINCLUDES)/lcdd.gmk
slic
diff -u -r1.12 -r1.13
--- GNUmakefile.local.in 17 Dec 2007 21:11:58 -0000 1.12
+++ GNUmakefile.local.in 10 Apr 2008 20:33:28 -0000 1.13
@@ -1,4 +1,4 @@
-# $Header: /cvs/lcd/slic/GNUmakefile.local.in,v 1.12 2007/12/17 21:11:58 jeremy Exp $
+# $Header: /cvs/lcd/slic/GNUmakefile.local.in,v 1.13 2008/04/10 20:33:28 jeremy Exp $
#
# Local build settings generated by configure
#
@@ -48,6 +48,10 @@
# LCPhys base dir
LCPHYS_BASE = @LCPHYS_PREFIX@
+# HepPDT
+USE_HEPPDT = @USE_HEPPDT@
+HEPPDT_BASE = @HEPPDT_PREFIX@
+
# Doxygen exec path for docs
DOXYGEN = @DOXYGEN@
slic
diff -u -r1.30 -r1.31
--- aclocal.m4 5 Mar 2008 21:53:45 -0000 1.30
+++ aclocal.m4 10 Apr 2008 20:33:28 -0000 1.31
@@ -1,4 +1,4 @@
-dnl $Header: /cvs/lcd/slic/aclocal.m4,v 1.30 2008/03/05 21:53:45 jeremy Exp $
+dnl $Header: /cvs/lcd/slic/aclocal.m4,v 1.31 2008/04/10 20:33:28 jeremy Exp $
dnl /\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\
dnl Autoconf macros for SLIC and its dependencies friends.
@@ -672,7 +672,7 @@
if test -e "${GDML_TEST_FILE}"; then
AC_MSG_RESULT(yes)
- echo "found valid GDML installation at ${GDML_PREFIX}"
+dnl echo "found valid GDML installation at ${GDML_PREFIX}"
else
AC_MSG_ERROR(invalid GDML installation at ${GDML_PREFIX})
fi
@@ -681,6 +681,43 @@
])
+dnl
+dnl Macro to check for HepPDT library.
+dnl
+AC_DEFUN(SIM_SETUP_HEPPDT, [
+
+AC_MSG_CHECKING(for HepPDT installation)
+
+AC_ARG_WITH(heppdt,
+ AC_HELP_STRING([--with-heppdt=<path>], [ HepPDT installation base [[HEPPDT_BASE]] ]),
+ [HEPPDT_PREFIX=$with_heppdt])
+
+if test -z "${with_heppdt}"; then
+ if test -n "$HEPPDT_BASE"; then
+ HEPPDT_PREFIX=${HEPPDT_BASE}
+ else
+ AC_MSG_RESULT(no)
+ fi
+fi
+
+if test -e "${HEPPDT_PREFIX}/include/HepPDT/ParticleDataTable.hh"; then
+ AC_DEFINE(HAVE_HEPPDT)
+ AC_DEFINE(USE_HEPPDT)
+ USE_HEPPDT=1
+ AC_MSG_RESULT(yes)
+else
+ AC_MSG_ERROR(invalid HepPDT installation at ${HEPPDT_PREFIX})
+fi
+
+AC_SUBST(USE_HEPPDT)
+AC_SUBST(HEPPDT_PREFIX)
+
+])
+
+
+dnl
+dnl Macro to setup Doxygen.
+dnl
AC_DEFUN([SIM_SETUP_DOXYGEN], [
AC_CHECK_PROGS(DOXYGEN, doxygen)
slic
diff -u -r1.103 -r1.104
--- configure 9 Apr 2008 22:13:35 -0000 1.103
+++ configure 10 Apr 2008 20:33:28 -0000 1.104
@@ -311,7 +311,7 @@
#endif"
ac_default_prefix=$SLIC_BASE
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT CC CFLAGS ac_ct_CC SET_MAKE CPP EGREP G4_PREFIX G4WORKDIR G4SYSTEM GEANT4_FULL_VERSION GEANT4_MAJOR_VERSION GEANT4_MINOR_VERSION GEANT4_PATCH_VERSION CLHEP_PREFIX CLHEP_MAJOR_VERSION XERCES_PREFIX XERCES_LIBNAME GDML_PREFIX LCDD_PREFIX LCIO_PREFIX LCPHYS_PREFIX enable_lcphys SLIC_PREFIX DOXYGEN PACKAGE_AUTHORS PACKAGE_FULLNAME PACKAGE_INSTITUTION PACKAGE_DATE PACKAGE_WWW LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT CC CFLAGS ac_ct_CC SET_MAKE CPP EGREP G4_PREFIX G4WORKDIR G4SYSTEM GEANT4_FULL_VERSION GEANT4_MAJOR_VERSION GEANT4_MINOR_VERSION GEANT4_PATCH_VERSION CLHEP_PREFIX CLHEP_MAJOR_VERSION XERCES_PREFIX XERCES_LIBNAME GDML_PREFIX LCDD_PREFIX LCIO_PREFIX LCPHYS_PREFIX enable_lcphys USE_HEPPDT HEPPDT_PREFIX SLIC_PREFIX DOXYGEN PACKAGE_AUTHORS PACKAGE_FULLNAME PACKAGE_INSTITUTION PACKAGE_DATE PACKAGE_WWW LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -879,6 +879,7 @@
--with-lcdd=<path> LCDD installation base [LCDD_BASE]
--with-lcio=<path> LCIO installation base [LCIO]
--with-lcphys=<path> LCPhys installation base [LCPHYS_BASE]
+ --with-heppdt=<path> HepPDT installation base [HEPPDT_BASE]
Some influential environment variables:
CXX C++ compiler command
@@ -3731,7 +3732,6 @@
if test -e "${GDML_TEST_FILE}"; then
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
- echo "found valid GDML installation at ${GDML_PREFIX}"
else
{ { echo "$as_me:$LINENO: error: invalid GDML installation at ${GDML_PREFIX}" >&5
echo "$as_me: error: invalid GDML installation at ${GDML_PREFIX}" >&2;}
@@ -3913,6 +3913,51 @@
+# HepPDT
+
+
+echo "$as_me:$LINENO: checking for HepPDT installation" >&5
+echo $ECHO_N "checking for HepPDT installation... $ECHO_C" >&6
+
+
+# Check whether --with-heppdt or --without-heppdt was given.
+if test "${with_heppdt+set}" = set; then
+ withval="$with_heppdt"
+ HEPPDT_PREFIX=$with_heppdt
+fi;
+
+if test -z "${with_heppdt}"; then
+ if test -n "$HEPPDT_BASE"; then
+ HEPPDT_PREFIX=${HEPPDT_BASE}
+ else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+ fi
+fi
+
+if test -e "${HEPPDT_PREFIX}/include/HepPDT/ParticleDataTable.hh"; then
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_HEPPDT 1
+_ACEOF
+
+ cat >>confdefs.h <<\_ACEOF
+#define USE_HEPPDT 1
+_ACEOF
+
+ USE_HEPPDT=1
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+else
+ { { echo "$as_me:$LINENO: error: invalid HepPDT installation at ${HEPPDT_PREFIX}" >&5
+echo "$as_me: error: invalid HepPDT installation at ${HEPPDT_PREFIX}" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+
+
+
+
+
# SLIC
@@ -4826,6 +4871,8 @@
s,@LCIO_PREFIX@,$LCIO_PREFIX,;t t
s,@LCPHYS_PREFIX@,$LCPHYS_PREFIX,;t t
s,@enable_lcphys@,$enable_lcphys,;t t
+s,@USE_HEPPDT@,$USE_HEPPDT,;t t
+s,@HEPPDT_PREFIX@,$HEPPDT_PREFIX,;t t
s,@SLIC_PREFIX@,$SLIC_PREFIX,;t t
s,@DOXYGEN@,$DOXYGEN,;t t
s,@PACKAGE_AUTHORS@,$PACKAGE_AUTHORS,;t t
slic
diff -u -r1.90 -r1.91
--- configure.ac 9 Apr 2008 22:13:35 -0000 1.90
+++ configure.ac 10 Apr 2008 20:33:29 -0000 1.91
@@ -1,4 +1,4 @@
-# $Header: /cvs/lcd/slic/configure.ac,v 1.90 2008/04/09 22:13:35 jeremy Exp $
+# $Header: /cvs/lcd/slic/configure.ac,v 1.91 2008/04/10 20:33:29 jeremy Exp $
#
# Process this file with autoconf to produce a configure script for SLIC.
#
@@ -76,6 +76,9 @@
# LCPhys
SIM_SETUP_LCPHYS
+# HepPDT
+SIM_SETUP_HEPPDT
+
# SLIC
SIM_SETUP_SLIC
slic/config/make
diff -N heppdt.gmk
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ heppdt.gmk 10 Apr 2008 20:33:29 -0000 1.1
@@ -0,0 +1,18 @@
+# $Id: heppdt.gmk,v 1.1 2008/04/10 20:33:29 jeremy Exp $
+
+#
+# HepPDT Make fragment.
+#
+# These settings assume a standard in-place build
+# and do not require that 'make install' was executed.
+#
+
+ifdef USE_HEPPDT
+ ifdef HEPPDT_BASE
+ CPPFLAGS += -I$(HEPPDT_BASE)/include
+ LDFLAGS += -L$(HEPPDT_BASE)/src/HepPDT -L$(HEPPDT_BASE)/src/HepPID/
+ LOADLIBS += -lHepPDT -lHepPID
+ else
+ $(error define HEPPDT=/path/to/heppdt/install_dir)
+ endif
+endif
\ No newline at end of file
CVSspam 0.2.8
