Changeset 75 for MEMPHYS

Timestamp:

Jan 16, 2006, 9:37:42 AM (18 years ago)

Author:

barrand

Message:

G.Barrand : handle local HitsCollectionType

File:

• MEMPHYS/HEAD/cmt/requirements (modified) (4 diffs)

MEMPHYS/HEAD/cmt/requirements

@@ -10 +10 @@
 use G4Lab v7r*
 
+use OnXLab v1r*
 
 #//////////////////////////////////////////////////
@@ -35 +36 @@
 #//////////////////////////////////////////////////
 
+# Must not use Geant4 singletons if having not Geant4 shared libs.
+macro MEMPHYS_kind "dll"
 library MEMPHYS -import=OpenInventor -s=../source/Callbacks Callbacks.cxx InventorCallbacks.cxx
 macro MEMPHYS_cppflags "${G4Lab_Geant4_incs}"
@@ -44 +47 @@
 
 # Over Geant4 and AIDA only :
-application MEMPHYS_batch -import=expat ../applications/MEMPHYS_batch.cxx use_linkopts='"${MEMPHYSCore_linkopts} ${G4physics_lists_hadronic_linkopts} ${G4Lab_Geant4_linkopts} ${LabAnalysisFactory_linkopts} ${LibCore_linkopts} ${math_linkopts} ${dld_linkopts}"'
+application MEMPHYS_batch -import=expat ../applications/MEMPHYS_batch.cxx use_linkopts='"${MEMPHYSCore_linkopts} ${G4physics_lists_hadronic_linkopts} ${G4Lab_Geant4_linkopts} ${aida_config_libs} ${LibCore_linkopts} ${math_linkopts} ${dld_linkopts}"'
 macro MEMPHYS_batch_cppflags "${MEMPHYSCore_cppflags} ${G4physics_lists_hadronic_incs}"
 
 # Over G4Lab :
-application MEMPHYS_session -import=OpenInventor -import=expat ../applications/MEMPHYS_session.cxx use_linkopts='"${MEMPHYSCore_linkopts} ${G4physics_lists_hadronic_linkopts}  ${G4LabUIOnX_linkopts} ${G4LabCore_linkopts} ${G4Lab_Geant4_linkopts} ${G4LabHDUMMY_linkopts} ${HEPVisPlotter_linkopts} ${HEPVisDetector_linkopts} ${HEPVisGeometry_linkopts} ${HEPVisUtils_linkopts} ${freetype_linkopts} ${jpeg_linkopts} ${dvi2bitmap_linkopts} ${OpenInventor_linkopts} ${OnXCore_linkopts} ${LibXML_linkopts} ${expat_linkopts} ${LibZip_linkopts} ${zlib_linkopts} ${LibCore_linkopts} ${dld_linkopts} ${cxxstd_linkopts} ${Windows_linkopts} ${OpenGL_linkopts} ${Xext_linkopts} ${X11_linkopts} "' 
+application MEMPHYS_session -import=OpenInventor -import=expat ../applications/MEMPHYS_session.cxx ../applications/HitsCollectionType.cxx use_linkopts='"${MEMPHYSCore_linkopts} ${G4physics_lists_hadronic_linkopts}  ${G4LabUIOnX_linkopts} ${G4LabCore_linkopts} ${G4Lab_Geant4_linkopts} ${G4LabHDUMMY_linkopts} ${HEPVisPlotter_linkopts} ${HEPVisDetector_linkopts} ${HEPVisGeometry_linkopts} ${HEPVisUtils_linkopts} ${freetype_linkopts} ${jpeg_linkopts} ${dvi2bitmap_linkopts} ${OpenInventor_linkopts} ${OnXCore_linkopts} ${LibXML_linkopts} ${expat_linkopts} ${LibZip_linkopts} ${zlib_linkopts} ${LibCore_linkopts} ${dld_linkopts} ${cxxstd_linkopts} ${Windows_linkopts} ${OpenGL_linkopts} ${Xext_linkopts} ${X11_linkopts} "' 
 macro MEMPHYS_session_cppflags "${G4Lab_Geant4_incs} ${MEMPHYS_batch_cppflags}"
-
-
-#JEC 18/11/05 not yet implemented: what's that Guy?
-# Over AIDA / Lab :
-#macro aida_config_libs "`aida-config --libs`" WIN32 "${LabAnalysisFactory_linkopts} ${LibCore_linkopts} ${math_linkopts} ${dld_linkopts}"
-#application MEMPHYS_analysis ../applications/MEMPHYS_analysis.cxx use_linkopts='"$(aida_config_libs)"'
 
 
@@ -88 +85 @@
 #//////////////////////////////////////////////////
 
-use Lab v11r*
-
-path_remove LD_LIBRARY_PATH "${MEMPHYSROOT}/$(Platform_bin)" WIN32 "" Darwin ""
-path_append LD_LIBRARY_PATH "${MEMPHYSROOT}/$(Platform_bin)" WIN32 "" Darwin ""
-
-path_remove DYLD_LIBRARY_PATH "" Darwin "${MEMPHYSROOT}/$(Platform_bin)" WIN32 ""
-path_append DYLD_LIBRARY_PATH "" Darwin "${MEMPHYSROOT}/$(Platform_bin)" WIN32 ""
-
-path_remove PATH "" WIN32 "${MEMPHYSROOT}\$(Platform_bin)"
-path_append PATH "" WIN32 "${MEMPHYSROOT}\$(Platform_bin)"
+apply_pattern Platform_paths