Import Geant4 11.4.0 source tree
This commit is contained in:
@@ -354,7 +354,6 @@ endif()
|
||||
|
||||
# - Qt (UI and Vis!)
|
||||
set(Geant4_qt_FOUND @GEANT4_USE_QT@)
|
||||
set(Geant4_qt3d_FOUND @GEANT4_USE_QT3D@)
|
||||
if(Geant4_qt_FOUND)
|
||||
# Must always refind Qt to recreate imported targets. Because these
|
||||
# are in the public interface, always need linking.
|
||||
@@ -366,12 +365,6 @@ if(Geant4_qt_FOUND)
|
||||
find_dependency(Qt@QT_VERSION_MAJOR@OpenGLWidgets REQUIRED)
|
||||
endif()
|
||||
|
||||
if(Geant4_qt3d_FOUND)
|
||||
find_dependency(Qt@QT_VERSION_MAJOR@3DCore @QT3D_MINIMUM_VERSION@ REQUIRED)
|
||||
find_dependency(Qt@QT_VERSION_MAJOR@3DExtras @QT3D_MINIMUM_VERSION@ REQUIRED)
|
||||
find_dependency(Qt@QT_VERSION_MAJOR@3DRender @QT3D_MINIMUM_VERSION@ REQUIRED)
|
||||
endif()
|
||||
|
||||
# Also require OpenGL
|
||||
find_dependency(OpenGL)
|
||||
|
||||
@@ -380,8 +373,6 @@ if(Geant4_qt_FOUND)
|
||||
OR ("vis_openinventor" IN_LIST Geant4_FIND_COMPONENTS)
|
||||
OR Geant4_ui_all_FOUND OR Geant4_vis_all_FOUND)
|
||||
set(_geant4_use_opengl_library ON)
|
||||
# Qt3D is always on if available
|
||||
set(_geant4_use_qt3D_library ${Geant4_qt3d_FOUND})
|
||||
endif()
|
||||
endif()
|
||||
|
||||
@@ -514,7 +505,6 @@ set(_geant4_internal_libraries
|
||||
Geant4::G4Tree${_geant4_lib_use_suffix}
|
||||
Geant4::G4FR${_geant4_lib_use_suffix}
|
||||
Geant4::G4GMocren${_geant4_lib_use_suffix}
|
||||
Geant4::G4visHepRep${_geant4_lib_use_suffix}
|
||||
Geant4::G4RayTracer${_geant4_lib_use_suffix}
|
||||
Geant4::G4VRML${_geant4_lib_use_suffix}
|
||||
Geant4::G4ToolsSG${_geant4_lib_use_suffix})
|
||||
@@ -524,11 +514,6 @@ if(_geant4_use_opengl_library)
|
||||
list(APPEND _geant4_internal_libraries Geant4::G4OpenGL${_geant4_lib_use_suffix})
|
||||
endif()
|
||||
|
||||
# - Qt3D if it's requested.
|
||||
if(_geant4_use_qt3D_library)
|
||||
list(APPEND _geant4_internal_libraries Geant4::G4visQt3D${_geant4_lib_use_suffix})
|
||||
endif()
|
||||
|
||||
# - G4OpenInventor if it's requested.
|
||||
if(_geant4_use_inventor_library)
|
||||
list(APPEND _geant4_internal_libraries Geant4::G4OpenInventor${_geant4_lib_use_suffix})
|
||||
|
||||
@@ -66,7 +66,6 @@ vis_cflags="-DG4UI_USE_TCSH"
|
||||
vis_libs="-lG4Tree \
|
||||
-lG4FR \
|
||||
-lG4GMocren \
|
||||
-lG4visHepRep \
|
||||
-lG4RayTracer \
|
||||
-lG4VRML \
|
||||
-lG4ToolsSG \
|
||||
@@ -126,7 +125,8 @@ libs="-lG4interfaces \
|
||||
-lG4event \
|
||||
-lG4tracking \
|
||||
-lG4parmodels \
|
||||
-lG4processes \
|
||||
-lG4processes_hadronic \
|
||||
-lG4processes_core
|
||||
-lG4digits_hits \
|
||||
-lG4track \
|
||||
-lG4particles \
|
||||
@@ -221,15 +221,6 @@ if test "x${have_qt}" = "xyes" ; then
|
||||
geant4_uses_opengl="yes"
|
||||
fi
|
||||
|
||||
# - QT3D
|
||||
have_qt3d="@G4_BUILTWITH_QT3D@"
|
||||
feature_list="${feature_list} qt3d[${have_qt3d}]"
|
||||
|
||||
if test "x${have_qt3d}" = "xyes" ; then
|
||||
vis_libs="-lG4visQt3D ${vis_libs}"
|
||||
vis_cflags="${vis_cflags} -DG4UI_USE_QT3D"
|
||||
fi
|
||||
|
||||
# - Motif
|
||||
have_motif="@G4_BUILTWITH_MOTIF@"
|
||||
feature_list="${feature_list} motif[${have_motif}]"
|
||||
@@ -677,9 +668,6 @@ while test $# -gt 0 ; do
|
||||
qt)
|
||||
echo ${have_qt}
|
||||
;;
|
||||
qt3d)
|
||||
echo ${have_qt3d}
|
||||
;;
|
||||
vtk)
|
||||
echo ${have_vtk}
|
||||
;;
|
||||
|
||||
Reference in New Issue
Block a user