lars/geant4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Import Geant4 10.6.1 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2020-02-14 15:32:52 +01:00
parent 5baee230e9
commit 8c87fe78c4
278 changed files with 24232 additions and 22963 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/visualization/OpenGL/GNUmakefile
+4 -1
View File
@@ -14,7 +14,10 @@ endif
# CPPFLAGS += -DG4DEBUG_VIS_OGL
GLOBLIBS = libG4vis_management.lib libG4modeling.lib libG4gl2ps.lib
GLOBLIBS += libG4zlib.lib libG4interfaces.lib libG4run.lib libG4event.lib
ifdef G4LIB_BUILD_ZLIB
GLOBLIBS += libG4zlib.lib
endif
GLOBLIBS += libG4interfaces.lib libG4run.lib libG4event.lib
GLOBLIBS += libG4tracking.lib libG4processes.lib libG4digits_hits.lib
GLOBLIBS += libG4track.lib libG4particles.lib libG4geometry.lib
GLOBLIBS += libG4materials.lib libG4graphics_reps.lib
source/visualization/OpenInventor/CMakeLists.txt
+8
View File
@@ -17,3 +17,11 @@ else()
GEANT4_GLOBAL_LIBRARY_TARGET(COMPONENTS sources.cmake)
endif()
# Fix for Inventor not yet supporting usage requirements
if(TARGET G4OpenInventor)
target_include_directories(G4OpenInventor PUBLIC ${G4VIS_MODULE_OPENINVENTOR_INCLUDE_DIRS})
endif()
if(TARGET G4OpenInventor-static)
target_include_directories(G4OpenInventor-static PUBLIC ${G4VIS_MODULE_OPENINVENTOR_INCLUDE_DIRS})
endif()
source/visualization/OpenInventor/GNUmakefile
+4 -1
View File
@@ -6,7 +6,10 @@ ifndef G4INSTALL
endif
GLOBLIBS = libG4vis_management.lib libG4modeling.lib libG4gl2ps.lib
GLOBLIBS += libG4zlib.lib libG4interfaces.lib libG4run.lib libG4event.lib
ifdef G4LIB_BUILD_ZLIB
GLOBLIBS += libG4zlib.lib
endif
GLOBLIBS += libG4interfaces.lib libG4run.lib libG4event.lib
GLOBLIBS += libG4tracking.lib libG4processes.lib libG4digits_hits.lib
GLOBLIBS += libG4track.lib libG4particles.lib libG4geometry.lib
GLOBLIBS += libG4materials.lib libG4graphics_reps.lib
source/visualization/OpenInventor/History
+5
View File
@@ -18,6 +18,11 @@ committal in the CVS repository !
History file for visualization/OpenInventor
-------------------------------------------
22 January 2020 B.Morgan (openinventor-V10-05-08)
- Add include paths to Inventor et al to usage requirements on G4OpenInventor
Inventor does not yet support imported targets, and paths added by
include_directories are now explicitly removed.
Fixes Bugzilla 2215
23rd October 2019 Ben Morgan (openinventor-V10-05-07)
- Remove inclusion of QT_USE_FILE from CMake scripts.
source/visualization/OpenInventor/sources.cmake
+6
View File
@@ -40,9 +40,11 @@ include_directories(${CMAKE_SOURCE_DIR}/source/visualization/modeling/include)
# Generic Inventor Headers, base library, OpenGL and Geant4 defines
#
include_directories(${INVENTOR_INCLUDE_DIR})
set(G4VIS_MODULE_OPENINVENTOR_INCLUDE_DIRS ${INVENTOR_INCLUDE_DIR})
set(G4VIS_MODULE_OPENINVENTOR_LINK_LIBRARIES ${INVENTOR_LIBRARY})
include_directories(${OPENGL_INCLUDE_DIR})
list(APPEND G4VIS_MODULE_OPENINVENTOR_INCLUDE_DIRS ${OPENGL_INCLUDE_DIR})
list(APPEND G4VIS_MODULE_OPENINVENTOR_LINK_LIBRARIES ${OPENGL_LIBRARIES})
add_definitions(-DG4VIS_BUILD_OI_DRIVER)
@@ -133,6 +135,10 @@ if(UNIX)
# We also need Xm and X11
include_directories(${X11_INCLUDE_DIR})
include_directories(${MOTIF_INCLUDE_DIR})
list(APPEND G4VIS_MODULE_OPENINVENTOR_INCLUDE_DIRS
${OPENGL_INCLUDE_DIR}
${MOTIF_INCLUDE_DIR}
)
list(APPEND G4VIS_MODULE_OPENINVENTOR_LINK_LIBRARIES
${MOTIF_LIBRARIES}
${X11_LIBRARIES}
source/visualization/externals/gl2ps/GNUmakefile
Vendored
+3 -1
View File
@@ -10,7 +10,9 @@ ifndef G4INSTALL
G4INSTALL = ../../../..
endif
GLOBLIBS = libG4zlib.lib
ifdef G4LIB_BUILD_ZLIB
GLOBLIBS = libG4zlib.lib
endif
include $(G4INSTALL)/config/architecture.gmk
include $(G4INSTALL)/config/G4VIS_BUILD.gmk