| Commit in SimDist on MAIN |
| configure | [binary] | 1.116 -> 1.117 |
| build/geant4.m4 | +6 | | 1.20 -> 1.21 |
| packages/geant4/Makefile.in | +4 | -2 | 1.22 -> 1.23 |
| /env.gmk.in | +10 | -9 | 1.14 -> 1.15 |
| packages/slic/Makefile.in | +2 | -2 | 1.10 -> 1.11 |
| +22 | -13 | |
5 modified files
SimDist/build
diff -u -r1.20 -r1.21
--- geant4.m4 19 Jul 2012 00:38:33 -0000 1.20
+++ geant4.m4 2 Aug 2012 21:16:18 -0000 1.21
@@ -212,6 +212,10 @@
ENABLE_G4DATA
+dnl FIXME: Hard-coded expat config
+G4LIB_BUILD_EXPAT=1
+G4LIB_USE_EXPAT=1
+
dnl Variable substitutions for Geant4 environment.
AC_SUBST(G4SYSTEM)
AC_SUBST(G4INSTALL)
@@ -265,6 +269,8 @@
AC_SUBST(G4VIS_BUILD_OPENGLQT_DRIVER)
AC_SUBST(G4VIS_USE_OPENGLQT)
AC_SUBST(G4LIB_BUILD_GDML)
+AC_SUBST(G4LIB_USE_EXPAT)
+AC_SUBST(G4LIB_BUILD_EXPAT)
])
SimDist/packages/geant4
diff -u -r1.22 -r1.23
--- Makefile.in 18 Jul 2012 22:20:51 -0000 1.22
+++ Makefile.in 2 Aug 2012 21:16:18 -0000 1.23
@@ -1,4 +1,4 @@
-# $Header: /cvs/lcd/SimDist/packages/geant4/Makefile.in,v 1.22 2012/07/18 22:20:51 jeremy Exp $
+# $Header: /cvs/lcd/SimDist/packages/geant4/Makefile.in,v 1.23 2012/08/02 21:16:18 jeremy Exp $
# package build settings
include ../../build/package.gmk
@@ -14,6 +14,8 @@
# set default make target
all: $(build_chain)
+.PHONY: all
+
# physics lists
phys:
@cd $(PACKAGE_BASEDIR)/physics_lists/hadronic && $(MAKE)
@@ -50,4 +52,4 @@
# test geant4 installation by trying to compile one of the examples
#test:
-# @cd $(PACKAGE_BASEDIR)/examples/novice/N01/ && export G4WORKDIR=`pwd` && $(MAKE) all;
\ No newline at end of file
+# @cd $(PACKAGE_BASEDIR)/examples/novice/N01/ && export G4WORKDIR=`pwd` && $(MAKE) all;
SimDist/packages/geant4
diff -u -r1.14 -r1.15
--- env.gmk.in 18 Jul 2012 22:20:51 -0000 1.14
+++ env.gmk.in 2 Aug 2012 21:16:18 -0000 1.15
@@ -1,10 +1,15 @@
-# $Id: env.gmk.in,v 1.14 2012/07/18 22:20:51 jeremy Exp $
+# $Id: env.gmk.in,v 1.15 2012/08/02 21:16:18 jeremy Exp $
-# Environment variables for the Geant4 build system.
+#
+# Environment variables for the Geant4 build system
+#
-# Might as well include this as it is the only external dependency.
+# externals
export CLHEP_BASE_DIR=@CLHEP_BASEDIR@
+export QTHOME=@QTHOME@
+export OGLHOME=@OGLHOME@
+# Geant4 internal build system variables
export G4SYSTEM=@G4SYSTEM@
export G4INSTALL=@G4INSTALL@
export G4WORKDIR=@G4WORKDIR@
@@ -51,14 +56,10 @@
export G4VIS_USE_OPENGL=@G4VIS_USE_OPENGL@
export G4VIS_BUILD_OPENGL=@G4VIS_BUILD_OPENGL@
export G4VERBOSE=@G4VERBOSE@
-
+export G4LIB_USE_EXPAT=@G4LIB_USE_EXPAT@
+export G4LIB_BUILD_EXPAT=@G4LIB_BUILD_EXPAT@
export G4LIB_BUILD_GDML=@G4LIB_BUILD_GDML@
-
export G4UI_BUILD_QT_SESSION=@G4UI_BUILD_QT_SESSION@
export G4UI_USE_QT=@G4UI_USE_QT@
export G4VIS_BUILD_OPENGLQT_DRIVER=@G4VIS_BUILD_OPENGLQT_DRIVER@
export G4VIS_USE_OPENGLQT=@G4VIS_USE_OPENGLQT@
-
-export QTHOME=@QTHOME@
-
-export OGLHOME=@OGLHOME@
\ No newline at end of file
SimDist/packages/slic
diff -u -r1.10 -r1.11
--- Makefile.in 12 Jul 2011 21:46:39 -0000 1.10
+++ Makefile.in 2 Aug 2012 21:16:19 -0000 1.11
@@ -1,4 +1,4 @@
-# $Header: /cvs/lcd/SimDist/packages/slic/Makefile.in,v 1.10 2011/07/12 21:46:39 jeremy Exp $
+# $Header: /cvs/lcd/SimDist/packages/slic/Makefile.in,v 1.11 2012/08/02 21:16:19 jeremy Exp $
# generic package build
include ../../build/package.gmk
@@ -8,7 +8,7 @@
# custom compile rule
# OVERRIDES package
-.PHONY: compile_all
+.PHONY: all
version: FORCE
cd $(PACKAGE_BASEDIR) && $(MAKE) -f GNUmakefile version;:
CVSspam 0.2.12