Changeset 689 for trunk/geant4/config


Ignore:
Timestamp:
Jan 17, 2008, 3:52:20 PM (16 years ago)
Author:
garnier
Message:

maj par rapport a cvs

Location:
trunk/geant4/config
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/geant4/config/History

    r609 r689  
    1 $Id: History,v 1.305 2007/11/16 10:44:51 lgarnier Exp $
     1$Id: History,v 1.312 2008/01/15 11:14:58 lgarnier Exp $
    22-------------------------------------------------------------------
    33
    … …  
    1717     ----------------------------------------------------------
    1818
     1915th January 2007, Laurent Garnier
     20 - common.gmk : Added a function to autogenerate the moc files for Qt driver
     21 - WIN32-VC : Added flags to build Qt driver on windows
     22
     2315th January 2008  Gabriele Cosmo (config-V09-01-00)
     24- Added commented lines for OpenGL setup in Darwin-g++.gmk for MacOS
     25  10.5 Leopard, pending fix from Apple.
     26
     2711th December 2007  Gabriele Cosmo (config-V09-00-12)
     28- Corrected setup for GDML on WIN32-VC to allow for building DLLs.
     29
     3030th November 2007  Ben Morgan (config-V09-00-11)
     31- Updated Configure script to handle Qt UI build.
     32- Updated internal scripts for Configure accordingly.
     33
     3422nd November 2007  Gabriele Cosmo (config-V09-00-10)
     35- Corrected addition of lXercesC and Zlib libraries in binmake.gmk.
     36- Added special case for WIN32-VC for names of XercesC libraries in architecture.gmk.
     37- Use 'gfortran' instead of 'g77' in Darwing-g++.gmk script. (I.McLaren)
     38
     3919th November 2007  Gabriele Cosmo (config-V09-00-09)
     40- Added "qmd" hadronic model to binmake.gmk.
     41
     4216th November 2007  Laurent Garnier (config-V09-00-08)
     43- Updated setup for Qt in Linux-g++.gmk and Darwin-g++.gmk scripts to
     44  support both Qt3 and Qt4.
     45
    194615th November 2007  Ben Morgan (config-V09-00-07)
    20 - Update Configure script to handle new 'gdml' sub-module and new data
     47- Updated Configure script to handle new 'gdml' sub-module and new data
    2148  libraries (G4ABLADATA and new G4EMLOW version).
    2249- Updated internal scripts for Configure accordingly.
    … …  
    325910th October 2007  Gunter Folger (config-V09-00-05)
    3360- Added "incl" (Liege cascade) hadronic model module to binmake.gmk.
    34 
    35 3th October 2007  Laurent Garnier
    36 - Added setup for Qt in those files :
    37  - config/G4UI_BUILD.gmk
    38  - config/G4UI_USE.gmk
    39  - config/G4VIS_BUILD.gmk
    40  - config/G4VIS_USE.gmk
    41  - config/interactivity.gmk
    42  - config/sys/Darwin-g++.gmk
    43  - config/sys/Linux-g++.gmk
    4461 
    456216th August 2007  Gabriele Cosmo (config-V09-00-04)

  • trunk/geant4/config/architecture.gmk

    r606 r689  
    1 # $Id: architecture.gmk,v 1.112 2007/11/02 16:29:06 gcosmo Exp $
     1# $Id: architecture.gmk,v 1.114 2007/12/11 13:20:29 gcosmo Exp $
    22# ------------------------------------------------------------------------
    33#       GEANT 4 - Architecture configuration script for GNU Make
    … …  
    269269  endif
    270270  ifndef GDMLLIBS
    271     GDMLLIBS := -L$(XERCESCROOT)/lib -lxerces-depdom -lxerces-c
     271    ifneq (,$(findstring WIN32-VC,$(G4SYSTEM)))
     272      GDMLLIBS := $(LIB_PATH)$(XERCESCROOT)/lib xerces-depdom_2.lib xerces-c_2.lib
     273    else
     274      GDMLLIBS := -L$(XERCESCROOT)/lib -lxerces-depdom -lxerces-c
     275    endif
    272276  endif
    273277  CPPFLAGS  += $(GDMLFLAGS)

  • trunk/geant4/config/binmake.gmk

    r606 r689  
    1 # $Id: binmake.gmk,v 1.133 2007/11/02 15:57:52 gcosmo Exp $
     1# $Id: binmake.gmk,v 1.135 2007/11/22 14:08:10 gcosmo Exp $
    22# ----------------------------------------------------------
    33# Script defining rules and paths for making binaries.
    … …  
    115115              -I$(G4BASE)/processes/hadronic/models/photolepton_hadron/muon_nuclear/include \
    116116              -I$(G4BASE)/processes/hadronic/models/pre_equilibrium/exciton_model/include \
     117              -I$(G4BASE)/processes/hadronic/models/qmd/include \
    117118              -I$(G4BASE)/processes/hadronic/models/quark_molecular_dynamics/body/include \
    118119              -I$(G4BASE)/processes/hadronic/models/quark_molecular_dynamics/util/include \
    … …  
    255256endif
    256257
    257 ifdef G4LIB_BUILD_ZLIB
     258ifdef G4LIB_USE_ZLIB
    258259  LDLIBS2 += -lG4zlib
    259260endif
    … …  
    261262# LDLIBS3 contains the first set of low level libraries...
    262263#
    263 ifdef G4LIB_BUILD_GDML
     264ifdef G4LIB_USE_GDML
    264265  LDLIBS3 += $(GDMLLIBS)
    265266endif

  • trunk/geant4/config/common.gmk

    r647 r689  
    1 # $Id: common.gmk,v 1.43 2007/06/28 14:33:38 gcosmo Exp $
     1# $Id: common.gmk,v 1.44 2008/01/15 11:14:58 lgarnier Exp $
    22# ----------------------------------------------------------------
    33# Common part of GNUmakefile for libraries.  John Allison, 5/7/95.

  • trunk/geant4/config/scripts/env.csh.SH

    r606 r689  
    6161unsetenv  G4UI_USE_XAW
    6262unsetenv  G4UI_USE_XM
     63unsetenv  G4UI_USE_QT
    6364
    6465unsetenv  G4VIS_BUILD_DAWN_DRIVER
    … …  
    7071unsetenv  G4VIS_BUILD_RAYTRACERX_DRIVER
    7172unsetenv  G4VIS_BUILD_VRML_DRIVER
     73unsetenv  G4VIS_BUILD_OPENGLQT_DRIVER
    7274
    7375unsetenv  G4VIS_USE_DAWN
    … …  
    7981unsetenv  G4VIS_USE_RAYTRACERX
    8082unsetenv  G4VIS_USE_VRML
     83unsetenv  G4VIS_USE_OPENGLQT
    8184
    8285######################################
    … …  
    243246endif
    244247
     248#+
     249if ( X$g4ui_build_qt_session == Xy ) then
     250setenv G4UI_BUILD_QT_SESSION 1
     251echo "On this machine the G4UI_BUILD_QT_SESSION=\$G4UI_BUILD_QT_SESSION"
     252endif
     253
     254#+
     255if ( X$g4ui_use_qt == Xy ) then
     256setenv G4UI_USE_QT 1
     257echo "On this machine the G4UI_USE_QT=\$G4UI_USE_QT"
     258endif
     259
     260
     261
    245262#
    246263# g4vis
    … …  
    295312
    296313#+
     314if ( X$g4vis_build_openglqt_driver == Xy ) then
     315setenv G4VIS_BUILD_OPENGLQT_DRIVER 1
     316echo "On this machine the G4VIS_BUILD_OPENGLQT_DRIVER=\$G4VIS_BUILD_OPENGLQT_DRIVER"
     317endif
     318
     319
     320#+
    297321if ( X$g4vis_use_dawn == Xy ) then
    298322setenv G4VIS_USE_DAWN 1
    … …  
    343367
    344368#+
     369if ( X$g4vis_use_openglqt == Xy ) then
     370setenv G4VIS_USE_OPENGLQT 1
     371echo "On this machine the G4VIS_USE_OPENGLQT=\$G4VIS_USE_OPENGLQT"
     372endif
     373
     374#+
    345375if ( X$g4vis_oglhome != X )  then
    346376setenv OGLHOME "$g4vis_oglhome"
    … …  
    353383echo "On this machine the OIVHOME=\$OIVHOME"
    354384endif
     385
     386#+
     387if ( X$g4_qthome != X ) then
     388setenv QTHOME "$g4_qthome"
     389echo "On this machine the QTHOME=\$QTHOME"
     390endif
     391
     392
    355393
    356394#+

  • trunk/geant4/config/scripts/env.sh.SH

    r606 r689  
    6161unset  G4UI_USE_XAW
    6262unset  G4UI_USE_XM
     63unset  G4UI_USE_QT
    6364
    6465unset  G4VIS_BUILD_DAWN_DRIVER
    … …  
    7071unset  G4VIS_BUILD_RAYTRACERX_DRIVER
    7172unset  G4VIS_BUILD_VRML_DRIVER
     73unset  G4VIS_BUILD_OPENGLQT_DRIVER
    7274
    7375unset  G4VIS_USE_DAWN
    … …  
    7981unset  G4VIS_USE_RAYTRACERX
    8082unset  G4VIS_USE_VRML
     83unset  G4VIS_USE_OPENGLQT
    8184
    8285
    … …  
    313316fi
    314317
     318
     319#+
     320if [ X$g4ui_build_qt_session = Xy ] ; then
     321G4UI_BUILD_QT_SESSION=1
     322export G4UI_BUILD_QT_SESSION
     323if [ X\$g4non_display = X ] ; then
     324echo "On this machine the G4UI_BUILD_QT_SESSION=\$G4UI_BUILD_QT_SESSION"
     325fi
     326fi
     327
     328#+
     329if [ X$g4ui_use_qt = Xy ] ; then
     330G4UI_USE_QT=1
     331export G4UI_USE_QT
     332if [ X\$g4non_display = X ] ; then
     333echo "On this machine the G4UI_USE_QT=\$G4UI_USE_QT"
     334fi
     335fi
     336
     337
     338
    315339#
    316340# g4vis
    … …  
    389413
    390414#+
     415if [ X$g4vis_build_openglqt_driver = Xy ] ; then
     416G4VIS_BUILD_OPENGLQT_DRIVER=1
     417export G4VIS_BUILD_OPENGLQT_DRIVER
     418if [ X\$g4non_display = X ] ; then
     419echo "On this machine the G4VIS_BUILD_OPENGLQT_DRIVER=\$G4VIS_BUILD_OPENGLQT_DRIVER"
     420fi
     421fi
     422
     423
     424
     425#+
    391426if [ X$g4vis_use_dawn = Xy ] ; then
    392427G4VIS_USE_DAWN=1
    … …  
    461496
    462497#+
     498if [ X$g4vis_use_openglqt = Xy ] ; then
     499G4VIS_USE_OPENGLQT=1
     500export G4VIS_USE_OPENGLQT
     501if [ X\$g4non_display = X ] ; then
     502echo "On this machine the G4VIS_USE_OPENGLQT=\$G4VIS_USE_OPENGLQT"
     503fi
     504fi
     505
     506
     507
     508#+
    463509if [ X$g4vis_oglhome != X ] ; then
    464510OGLHOME="$g4vis_oglhome"
    … …  
    477523fi
    478524fi
     525
     526#+
     527if [ X$g4_qthome != X ] ; then
     528QTHOME=$g4_qthome
     529export QTHOME
     530if [ X\$g4non_display = X ] ; then
     531echo "On this machine the QTHOME=\$QTHOME"
     532fi
     533fi
     534
    479535
    480536#+

  • trunk/geant4/config/scripts/install.sh.SH

    r606 r689  
    5757unset  G4UI_BUILD_XAW_SESSION
    5858unset  G4UI_BUILD_XM_SESSION
     59unset  G4UI_BUILD_QT_SESSION
    5960unset  G4UI_USE_TCSH
    6061unset  G4UI_USE_WIN32
    6162unset  G4UI_USE_XAW
    6263unset  G4UI_USE_XM
     64unset  G4UI_USE_QT
    6365
    6466unset  G4VIS_BUILD_DAWN_DRIVER
    … …  
    7072unset  G4VIS_BUILD_RAYTRACERX_DRIVER
    7173unset  G4VIS_BUILD_VRML_DRIVER
     74unset  G4VIS_BUILD_OPENGLQT_DRIVER
    7275
    7376unset  G4VIS_USE_DAWN
    … …  
    7982unset  G4VIS_USE_RAYTRACERX
    8083unset  G4VIS_USE_VRML
     84unset  G4VIS_USE_OPENGLQT
    8185
    8286######################################
    … …  
    270274fi
    271275
     276
     277#+
     278if [ X$g4ui_build_qt_session = Xy ] ; then
     279G4UI_BUILD_QT_SESSION=1
     280export G4UI_BUILD_QT_SESSION
     281echo "On this machine the G4UI_BUILD_QT_SESSION=\$G4UI_BUILD_QT_SESSION"
     282fi
     283
     284#+
     285if [ X$g4ui_use_qt = Xy ] ; then
     286G4UI_USE_QT=1
     287export G4UI_USE_QT
     288echo "On this machine the G4UI_USE_QT=\$G4UI_USE_QT"
     289fi
     290
     291
    272292#
    273293# g4vis
    … …  
    330350
    331351#+
     352if [ X$g4vis_build_openglqt_driver = Xy ] ; then
     353G4VIS_BUILD_OPENGLQT_DRIVER=1
     354export G4VIS_BUILD_OPENGLQT_DRIVER
     355echo "On this machine the G4VIS_BUILD_OPENGLQT_DRIVER=\$G4VIS_BUILD_OPENGLQT_DRIVER"
     356fi
     357
     358
     359#+
    332360if [ X$g4vis_use_dawn = Xy ] ; then
    333361G4VIS_USE_DAWN=1
    … …  
    384412echo "On this machine the G4VIS_USE_VRML=\$G4VIS_USE_VRML"
    385413fi
     414
     415
     416#+
     417if [ X$g4vis_use_openglqt = Xy ] ; then
     418G4VIS_USE_OPENGLQT=1
     419export G4VIS_USE_OPENGLQT
     420echo "On this machine the G4VIS_USE_OPENGLQT=\$G4VIS_USE_OPENGLQT"
     421fi
     422
     423
     424
     425
     426
    386427
    387428#+
    … …  
    400441fi
    401442fi
     443
     444#+
     445if [ X$g4_qthome != X ] ; then
     446QTHOME=$g4_qthome
     447export QTHOME
     448echo "On this machine the QTHOME=\$QTHOME"
     449fi
     450
    402451
    403452#+

  • trunk/geant4/config/scripts/move.sh.SH

    r606 r689  
    206206fi
    207207
     208
     209#+
     210if [ X$g4ui_build_qt_session = Xy ] ; then
     211G4UI_BUILD_QT_SESSION=1
     212export G4UI_BUILD_QT_SESSION
     213echo "On this machine the G4UI_BUILD_QT_SESSION=\$G4UI_BUILD_QT_SESSION"
     214fi
     215
     216#+
     217if [ X$g4ui_use_qt = Xy ] ; then
     218G4UI_USE_QT=1
     219export G4UI_USE_QT
     220echo "On this machine the G4UI_USE_QT=\$G4UI_USE_QT"
     221fi
     222
     223
     224
    208225#
    209226# g4vis
    … …  
    259276
    260277#+
     278if [ X$g4vis_build_openglqt_driver = Xy ] ; then
     279G4VIS_BUILD_OPENGLQT_DRIVER=1
     280export G4VIS_BUILD_OPENGLQT_DRIVER
     281echo "On this machine the G4VIS_BUILD_OPENGLQT_DRIVER=\$G4VIS_BUILD_OPENGLQT_DRIVER"
     282fi
     283
     284
     285
     286#+
    261287if [ X$g4vis_use_dawn = Xy ] ; then
    262288G4VIS_USE_DAWN=1
    … …  
    308334
    309335#+
     336if [ X$g4vis_use_openglqt = Xy ] ; then
     337G4VIS_USE_OPENGLQT=1
     338export G4VIS_USE_OPENGLQT
     339echo "On this machine the G4VIS_USE_OPENGLQT=\$G4VIS_USE_OPENGLQT"
     340fi
     341
     342
     343
     344#+
    310345if [ X$g4vis_oglhome != X ] ; then
    311346OGLHOME="$g4vis_oglhome"
    … …  
    313348echo "On this machine the OGLHOME=\$OGLHOME"
    314349fi
     350
     351#+
     352if [ X$g4_qthome != X ] ; then
     353QTHOME=$g4_qthome
     354export QTHOME
     355echo "On this machine the QTHOME=\$QTHOME"
     356fi
     357
    315358
    316359

  • trunk/geant4/config/sys/Darwin-g++.gmk

    r608 r689  
    2828    CCFLAGS   += -pg
    2929  endif
    30   FC := g77
     30  FC := gfortran
    3131  FCFLAGS += -fno-automatic -fno-backslash -fno-second-underscore
    3232  LDFLAGS += -bind_at_load
    … …  
    7676  ifndef OGLLIBS
    7777    OGLLIBS   := -L$(OGLHOME)/lib -lGLU -lGL
     78# Uncomment the following lines for building on MacOSX 10.5 "Leopard"
     79#    OGLLIBS   += -dylib_file \
     80#                 /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:\
     81#                 /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
    7882  endif
    7983

  • trunk/geant4/config/sys/WIN32-VC.gmk

    r679 r689  
    9595             /libpath:$(G4LIBDIR) $(GLOBLIBS) \
    9696             $(LIB_PATH)$(CLHEP_LIB_DIR) $(CLHEP_LIB) \
    97              $(INTYLIBS) $(ANALYSISLIBS) $(UI32LIBS)
     97             $(INTYLIBS) $(GDMLLIBS) $(ANALYSISLIBS) $(UI32LIBS)
    9898  endef
    9999  define build-global-shared-lib
    … …  
    118118             /libpath:$(G4LIBDIR) $(GLOBLIBS) \
    119119             $(LIB_PATH)$(CLHEP_LIB_DIR) $(CLHEP_LIB) \
    120              $(INTYLIBS) $(ANALYSISLIBS) $(UI32LIBS)
     120             $(INTYLIBS) $(GDMLLIBS) $(ANALYSISLIBS) $(UI32LIBS)
    121121  endef
    122122endif
Note: See TracChangeset for help on using the changeset viewer.