Import Geant4 10.7.0.beta source tree

This commit is contained in:
Gabriele Cosmo
2020-06-26 10:23:25 +02:00
parent c02c370437
commit 67ba86d073
1871 changed files with 174422 additions and 131884 deletions
+12 -20
View File
@@ -1,27 +1,19 @@
#------------------------------------------------------------------------------
# CMakeLists.txt
# Module : G4interfaces
# Package: Geant4.src.G4interfaces
#
# Top level CMakeLists.txt for a Geant4 Global Library
# or collection of sublibraries
#
# Generated on : 24/9/2010
#
#
#------------------------------------------------------------------------------
add_subdirectory(GAG)
add_subdirectory(basic)
add_subdirectory(common)
if(NOT GEANT4_BUILD_GRANULAR_LIBS)
include(Geant4MacroLibraryTargets)
GEANT4_GLOBAL_LIBRARY_TARGET(NAME G4interfaces
COMPONENTS
GAG/sources.cmake
basic/sources.cmake
common/sources.cmake
geant4_global_library_target(NAME G4interfaces
COMPONENTS
GAG/sources.cmake
basic/sources.cmake
common/sources.cmake
)
endif()
if(GEANT4_USE_QT)
foreach(__target G4interfaces G4interfaces-static)
if(TARGET ${__target})
set_target_properties(${__target} PROPERTIES AUTOMOC 1)
endif()
endforeach()
endif()
-17
View File
@@ -1,17 +0,0 @@
#------------------------------------------------------------------------------
# CMakeLists.txt
# Module : G4UIGAG
# Package: Geant4.src.G4interfaces.G4UIGAG
#
# CMakeLists.txt for building a single granular library.
#
# Generated on : 24/9/2010
#
#
#------------------------------------------------------------------------------
if(GEANT4_BUILD_GRANULAR_LIBS)
include(Geant4MacroLibraryTargets)
GEANT4_GRANULAR_LIBRARY_TARGET(COMPONENT sources.cmake)
endif()
+14 -36
View File
@@ -1,47 +1,25 @@
#------------------------------------------------------------------------------
# sources.cmake
# Module : G4UIGAG
# Package: Geant4.src.G4interfaces.G4UIGAG
#
# Sources description for a library.
# Lists the sources and headers of the code explicitely.
# Lists include paths needed.
# Lists the internal granular and global dependencies of the library.
# Source specific properties should be added at the end.
#
# Generated on : 24/9/2010
#
#
#------------------------------------------------------------------------------
# List external includes needed.
include_directories(${CLHEP_INCLUDE_DIRS})
# List internal includes needed.
include_directories(${CMAKE_SOURCE_DIR}/source/global/management/include)
include_directories(${CMAKE_SOURCE_DIR}/source/intercoms/include)
include_directories(${CMAKE_SOURCE_DIR}/source/interfaces/common/include)
#
# Define the Geant4 Module.
#
include(Geant4MacroDefineModule)
GEANT4_DEFINE_MODULE(NAME G4UIGAG
HEADERS
G4UIGAG.hh
G4UIGainServer.hh
SOURCES
G4UIGAG.cc
G4UIGainServer.cc
GRANULAR_DEPENDENCIES
G4UIcommon
G4globman
G4intercoms
GLOBAL_DEPENDENCIES
G4global
G4intercoms
LINK_LIBRARIES
geant4_define_module(NAME G4UIGAG
HEADERS
G4UIGAG.hh
G4UIGainServer.hh
SOURCES
G4UIGAG.cc
G4UIGainServer.cc
GRANULAR_DEPENDENCIES
G4UIcommon
G4globman
G4intercoms
GLOBAL_DEPENDENCIES
G4global
G4intercoms
)
# List any source specific properties here
+21 -1
View File
@@ -16,9 +16,29 @@ committal in the CVS repository !
* Reverse chronological order (last date on top), please *
----------------------------------------------------------
16 Jan 2020 Gabriele Cosmo (interfaces-V10-05-08)
19 June 2020 John Allison (interfaces-V10-06-05)
- Fix Qt 5.15 deprecation warnings.
31 May 2020 Ben Morgan (interfaces-V10-06-04)
- Use add_definitions to set PRIVATE-level compile definitions
for compatibility between old/new CMake system
- Use CMake AUTOMOC to automatically generate and compile Moc
sources
16 Apr 2020 Ben Morgan (interfaces-V10-06-03)
- Remove Qt4 support
6 Apr 2020 Igor Semeniouk (interfaces-V10-06-02)
-- G4UIQt.cc:
o replace setcolor with rich text html tags.
16 Jan 2020 Gabriele Cosmo (interfaces-V10-06-01)
- Fixed obsolete URLs in UIQt splash screen.
11 Dec 2019 Ben Morgan (interfaces-V10-06-00)
- Cleanup CMake build, removing obsolete granular library options and
explicit include_directories.
30 Nov 2019 Igor Semeniouk (interfaces-V10-05-07)
-- G4UIQt.cc:
o fix ui command not stored in callback for icon defined via /gui/addIcon command.
-17
View File
@@ -1,17 +0,0 @@
#------------------------------------------------------------------------------
# CMakeLists.txt
# Module : G4UIbasic
# Package: Geant4.src.G4interfaces.G4UIbasic
#
# CMakeLists.txt for building a single granular library.
#
# Generated on : 24/9/2010
#
#
#------------------------------------------------------------------------------
if(GEANT4_BUILD_GRANULAR_LIBS)
include(Geant4MacroLibraryTargets)
GEANT4_GRANULAR_LIBRARY_TARGET(COMPONENT sources.cmake)
endif()
+4 -1
View File
@@ -275,8 +275,11 @@ private:
virtual G4bool GetHelpChoice(G4int&);// have to be implemeted because we heritate from G4VBasicShell
bool eventFilter(QObject*,QEvent*);
void ActivateCommand(G4String);
#if QT_VERSION < 0x050F00
QMap<int,QString> LookForHelpStringInChildTree(G4UIcommandTree *,const QString&);
#else
QMultiMap<int,QString> LookForHelpStringInChildTree(G4UIcommandTree *,const QString&);
#endif
QWidget* CreateVisParametersTBWidget();
QWidget* CreateHelpTBWidget();
G4UIDockWidget* CreateCoutTBWidget();
+59 -117
View File
@@ -1,164 +1,106 @@
#------------------------------------------------------------------------------
# sources.cmake
# Module : G4UIbasic
# Package: Geant4.src.G4interfaces.G4UIbasic
#
# Sources description for a library.
# Lists the sources and headers of the code explicitely.
# Lists include paths needed.
# Lists the internal granular and global dependencies of the library.
# Source specific properties should be added at the end.
#
# Generated on : 24/9/2010
#
#
#------------------------------------------------------------------------------
# List external includes needed.
include_directories(${CLHEP_INCLUDE_DIRS})
# List internal includes needed.
include_directories(${CMAKE_SOURCE_DIR}/source/global/management/include)
include_directories(${CMAKE_SOURCE_DIR}/source/intercoms/include)
include_directories(${CMAKE_SOURCE_DIR}/source/interfaces/common/include)
include_directories(${CMAKE_SOURCE_DIR}/source/interfaces/GAG/include)
#
# Module has optional sources
#
include(Geant4MacroDefineModule)
# List those always built
set(G4INTERFACES_BASIC_MODULE_HEADERS
G4UIArrayString.hh
G4UIExecutive.hh
G4UIcsh.hh
G4UIterminal.hh
G4VUIshell.hh)
set(G4INTERFACES_BASIC_MODULE_HEADERS
G4UIArrayString.hh
G4UIExecutive.hh
G4UIcsh.hh
G4UIterminal.hh
G4VUIshell.hh)
set(G4INTERFACES_BASIC_MODULE_SOURCES
G4UIArrayString.cc
G4UIExecutive.cc
G4UIcsh.cc
G4UIterminal.cc
G4VUIshell.cc)
G4UIArrayString.cc
G4UIExecutive.cc
G4UIcsh.cc
G4UIterminal.cc
G4VUIshell.cc)
set(G4INTERFACES_BASIC_MODULE_LINK_LIBRARIES )
#
# Tcsh only on UNIX style systems, but always built here
#
if(UNIX)
list(APPEND G4INTERFACES_BASIC_MODULE_HEADERS G4UItcsh.hh)
list(APPEND G4INTERFACES_BASIC_MODULE_SOURCES G4UItcsh.cc)
endif()
#
# Win32 terminal only for MSVC builds, but always built here
#
if(MSVC)
list(APPEND G4INTERFACES_BASIC_MODULE_HEADERS G4UIWin32.hh)
list(APPEND G4INTERFACES_BASIC_MODULE_SOURCES G4UIWin32.cc)
list(APPEND G4INTERFACES_BASIC_MODULE_HEADERS G4UIWin32.hh)
list(APPEND G4INTERFACES_BASIC_MODULE_SOURCES G4UIWin32.cc)
GEANT4_ADD_COMPILE_DEFINITIONS(
SOURCES G4UIWin32.cc G4UIExecutive.cc
COMPILE_DEFINITIONS G4UI_BUILD_WIN32_SESSION;G4INTY_BUILD_WIN32
)
add_definitions(-DG4UI_BUILD_WIN32_SESSION -DG4INTY_BUILD_WIN32)
endif()
#
# Qt only if selected.
#
if(GEANT4_USE_QT)
list(APPEND G4INTERFACES_BASIC_MODULE_HEADERS G4UIQt.hh)
list(APPEND G4INTERFACES_BASIC_MODULE_SOURCES G4UIQt.cc)
list(APPEND G4INTERFACES_BASIC_MODULE_HEADERS G4UIQt.hh)
list(APPEND G4INTERFACES_BASIC_MODULE_SOURCES G4UIQt.cc)
# Add the moc sources - must use an absolute path to the files being
# wrapped
QT4_WRAP_CPP(G4INTERFACES_MOC_SOURCES
${CMAKE_SOURCE_DIR}/source/interfaces/basic/include/G4UIQt.hh
OPTIONS -DG4UI_BUILD_QT_SESSION)
# Add the definitions
# We have to also add in G4INTY_BUILD_QT 'cause G4QT header needs that...
add_definitions(-DG4UI_BUILD_QT_SESSION -DG4INTY_BUILD_QT)
list(APPEND G4INTERFACES_BASIC_MODULE_SOURCES ${G4INTERFACES_MOC_SOURCES})
# Add the definitions
# We have to also add in G4INTY_BUILD_QT 'cause G4QT header needs that...
GEANT4_ADD_COMPILE_DEFINITIONS(SOURCES G4UIQt.cc G4UIExecutive.cc
COMPILE_DEFINITIONS G4UI_BUILD_QT_SESSION;G4INTY_BUILD_QT)
# and for the moc file...
set_source_files_properties(${G4INTERFACES_MOC_SOURCES}
PROPERTIES COMPILE_DEFINITIONS G4UI_BUILD_QT_SESSION)
# Add the extra libraries - seem to need to quote variables to get
# both linked in.
list(APPEND G4INTERFACES_BASIC_MODULE_LINK_LIBRARIES
"${QT_QTGUI_LIBRARY};${QT_QTCORE_LIBRARY}")
# Add the extra libraries
list(APPEND G4INTERFACES_BASIC_MODULE_LINK_LIBRARIES Qt5::Gui Qt5::Widgets Qt5::Core)
endif()
#
# Wt only if selected.
# Wt (deprecated, left in case it is revived)
#
if(GEANT4_USE_WT)
list(APPEND G4INTERFACES_BASIC_MODULE_HEADERS G4UIWt.hh)
list(APPEND G4INTERFACES_BASIC_MODULE_SOURCES G4UIWt.cc)
# We have to also add in G4INTY_BUILD_Wt 'cause G4Wt header needs that...
GEANT4_ADD_COMPILE_DEFINITIONS(SOURCES G4UIWt.cc G4UIExecutive.cc
COMPILE_DEFINITIONS G4UI_BUILD_WT_SESSION;G4INTY_BUILD_WT)
# Add the extra libraries
list(APPEND G4INTERFACES_BASIC_MODULE_LINK_LIBRARIES Wt::Wt Wt::HTTP)
endif()
#if(GEANT4_USE_WT)
# list(APPEND G4INTERFACES_BASIC_MODULE_SOURCES G4UIWt.cc)
# list(APPEND G4INTERFACES_BASIC_MODULE_HEADERS G4UIWt.hh)
#
# # We have to also add in G4INTY_BUILD_Wt 'cause G4Wt header needs that...
# GEANT4_ADD_COMPILE_DEFINITIONS(SOURCES G4UIWt.cc G4UIExecutive.cc
# COMPILE_DEFINITIONS G4UI_BUILD_WT_SESSION;G4INTY_BUILD_WT)
#
# # Add the extra libraries
# list(APPEND G4INTERFACES_BASIC_MODULE_LINK_LIBRARIES Wt::Wt Wt::HTTP)
#endif()
# Xm and only on UNIX and if selected
#
if(UNIX)
if(GEANT4_USE_XM)
list(APPEND G4INTERFACES_BASIC_MODULE_HEADERS G4UIXm.hh)
list(APPEND G4INTERFACES_BASIC_MODULE_SOURCES G4UIXm.cc)
if(UNIX AND GEANT4_USE_XM)
list(APPEND G4INTERFACES_BASIC_MODULE_HEADERS G4UIXm.hh)
list(APPEND G4INTERFACES_BASIC_MODULE_SOURCES G4UIXm.cc)
# Add the compile definitions - also need INTY versions
GEANT4_ADD_COMPILE_DEFINITIONS(
SOURCES G4UIXm.cc G4UIExecutive.cc
COMPILE_DEFINITIONS G4UI_BUILD_XM_SESSION;G4INTY_BUILD_XT
)
# Add the compile definitions - also need INTY versions
add_definitions(-DG4UI_BUILD_XM_SESSION -DG4INTY_BUILD_XT)
# Need the X11 and Motif libraries
list(APPEND G4INTERFACES_BASIC_MODULE_LINK_LIBRARIES
Motif::Xm
X11::SM X11::ICE X11::X11 X11::Xext X11::Xmu X11::Xt
)
endif()
# Need the X11 and Motif libraries
list(APPEND G4INTERFACES_BASIC_MODULE_LINK_LIBRARIES
Motif::Xm
X11::SM X11::ICE X11::X11 X11::Xext X11::Xmu X11::Xt
)
endif()
#
# Define the Geant4 Module.
#
GEANT4_DEFINE_MODULE(NAME G4UIbasic
HEADERS
${G4INTERFACES_BASIC_MODULE_HEADERS}
SOURCES
${G4INTERFACES_BASIC_MODULE_SOURCES}
GRANULAR_DEPENDENCIES
G4UIcommon
G4globman
G4intercoms
GLOBAL_DEPENDENCIES
G4global
G4intercoms
LINK_LIBRARIES
${G4INTERFACES_BASIC_MODULE_LINK_LIBRARIES}
${timemory_LIBRARIES}
geant4_define_module(NAME G4UIbasic
HEADERS
${G4INTERFACES_BASIC_MODULE_HEADERS}
SOURCES
${G4INTERFACES_BASIC_MODULE_SOURCES}
GRANULAR_DEPENDENCIES
G4UIcommon
G4globman
G4intercoms
GLOBAL_DEPENDENCIES
G4global
G4intercoms
LINK_LIBRARIES
${G4INTERFACES_BASIC_MODULE_LINK_LIBRARIES}
${timemory_LIBRARIES}
)
# List any source specific properties here
File diff suppressed because it is too large Load Diff
-17
View File
@@ -1,17 +0,0 @@
#------------------------------------------------------------------------------
# CMakeLists.txt
# Module : G4UIcommon
# Package: Geant4.src.G4interfaces.G4UIcommon
#
# CMakeLists.txt for building a single granular library.
#
# Generated on : 24/9/2010
#
#
#------------------------------------------------------------------------------
if(GEANT4_BUILD_GRANULAR_LIBS)
include(Geant4MacroLibraryTargets)
GEANT4_GRANULAR_LIBRARY_TARGET(COMPONENT sources.cmake)
endif()
+63 -101
View File
@@ -1,139 +1,101 @@
#------------------------------------------------------------------------------
# sources.cmake
# Module : G4UIcommon
# Package: Geant4.src.G4interfaces.G4UIcommon
#
# Sources description for a library.
# Lists the sources and headers of the code explicitely.
# Lists include paths needed.
# Lists the internal granular and global dependencies of the library.
# Source specific properties should be added at the end.
#
# Generated on : 24/9/2010
#
#
#------------------------------------------------------------------------------
# List external includes needed.
include_directories(${CLHEP_INCLUDE_DIRS})
# List internal includes needed.
include_directories(${CMAKE_SOURCE_DIR}/source/global/management/include)
include_directories(${CMAKE_SOURCE_DIR}/source/intercoms/include)
#include_directories(${CMAKE_SOURCE_DIR}/source/interfaces/basic/include)
#
# Module has optional sources
#
include(Geant4MacroDefineModule)
# List those always built
set(G4INTERFACES_COMMON_MODULE_HEADERS
G4InteractorMessenger.hh
G4VBasicShell.hh
G4VInteractiveSession.hh
G4VInteractorManager.hh)
set(G4INTERFACES_COMMON_MODULE_HEADERS
G4InteractorMessenger.hh
G4VBasicShell.hh
G4VInteractiveSession.hh
G4VInteractorManager.hh)
set(G4INTERFACES_COMMON_MODULE_SOURCES
G4InteractorMessenger.cc
G4VBasicShell.cc
G4VInteractiveSession.cc
G4VInteractorManager.cc)
G4InteractorMessenger.cc
G4VBasicShell.cc
G4VInteractiveSession.cc
G4VInteractorManager.cc)
set(G4INTERFACES_COMMON_MODULE_LINK_LIBRARIES )
#
# Add Qt if required
#
if(GEANT4_USE_QT)
# Add the sources
list(APPEND G4INTERFACES_COMMON_MODULE_HEADERS G4Qt.hh)
list(APPEND G4INTERFACES_COMMON_MODULE_SOURCES G4Qt.cc)
# Must enable Qt source with a def...
GEANT4_ADD_COMPILE_DEFINITIONS(SOURCES G4Qt.cc
COMPILE_DEFINITIONS G4INTY_BUILD_QT)
# Add the sources
list(APPEND G4INTERFACES_COMMON_MODULE_HEADERS G4Qt.hh)
list(APPEND G4INTERFACES_COMMON_MODULE_SOURCES G4Qt.cc)
# It uses Qt core and gui(?) libs
list(APPEND G4INTERFACES_COMMON_MODULE_LINK_LIBRARIES
"${QT_QTGUI_LIBRARY};${QT_QTCORE_LIBRARY}")
# Must enable Qt source with a def...
add_definitions(-DG4INTY_BUILD_QT)
# It uses Qt core and gui(?) libs
list(APPEND G4INTERFACES_COMMON_MODULE_LINK_LIBRARIES
Qt5::Gui Qt5::Core)
endif()
#
# Add Wt if required
# Wt (deprecated)
#
if(GEANT4_USE_WT)
# Add the sources
list(APPEND G4INTERFACES_COMMON_MODULE_HEADERS G4Wt.hh)
list(APPEND G4INTERFACES_COMMON_MODULE_SOURCES G4Wt.cc)
# Source needs to have a compile definition
GEANT4_ADD_COMPILE_DEFINITIONS(
SOURCES G4Wt.cc
COMPILE_DEFINITIONS G4INTY_BUILD_WT
)
# It uses Wt libs
list(APPEND G4INTERFACES_COMMON_MODULE_LINK_LIBRARIES
Wt::Wt Wt::HTTP)
endif()
#if(GEANT4_USE_WT)
# # Add the sources
# list(APPEND G4INTERFACES_COMMON_MODULE_HEADERS G4Wt.hh)
# list(APPEND G4INTERFACES_COMMON_MODULE_SOURCES G4Wt.cc)
#
# # Source needs to have a compile definition
# GEANT4_ADD_COMPILE_DEFINITIONS(
# SOURCES G4Wt.cc
# COMPILE_DEFINITIONS G4INTY_BUILD_WT
# )
#
# # It uses Wt libs
# list(APPEND G4INTERFACES_COMMON_MODULE_LINK_LIBRARIES
# Wt::Wt Wt::HTTP)
#endif()
# Win32 option - always built when we're using MSVC
#
if(MSVC)
# Add the sources
list(APPEND G4INTERFACES_COMMON_MODULE_HEADERS G4Win32.hh)
list(APPEND G4INTERFACES_COMMON_MODULE_SOURCES G4Win32.cc)
# Add the sources
list(APPEND G4INTERFACES_COMMON_MODULE_HEADERS G4Win32.hh)
list(APPEND G4INTERFACES_COMMON_MODULE_SOURCES G4Win32.cc)
# Add the needed compile definitions to these sources
GEANT4_ADD_COMPILE_DEFINITIONS(
SOURCES G4Win32.cc
COMPILE_DEFINITIONS G4INTY_BUILD_WIN32
)
# Add the needed compile definitions to these sources
add_definitions(-DG4INTY_BUILD_WIN32)
endif()
#
# X11 options - we only need this for Xm UI
#
if(UNIX)
if(GEANT4_USE_XM OR GEANT4_USE_INVENTOR)
# Add the sources
list(APPEND G4INTERFACES_COMMON_MODULE_HEADERS G4Xt.hh)
list(APPEND G4INTERFACES_COMMON_MODULE_SOURCES G4Xt.cc)
# X11 options - we only need this for Xm and/or Inventor UI
if(UNIX AND (GEANT4_USE_XM OR GEANT4_USE_INVENTOR))
# Add the sources
list(APPEND G4INTERFACES_COMMON_MODULE_HEADERS G4Xt.hh)
list(APPEND G4INTERFACES_COMMON_MODULE_SOURCES G4Xt.cc)
# Source needs to have a compile definition
GEANT4_ADD_COMPILE_DEFINITIONS(
SOURCES G4Xt.cc
COMPILE_DEFINITIONS G4INTY_BUILD_XT
)
# Source needs to have a compile definition
add_definitions(-DG4INTY_BUILD_XT)
# It uses the X11 libs?
list(APPEND G4INTERFACES_COMMON_MODULE_LINK_LIBRARIES
X11::SM X11::ICE X11::X11 X11::Xext X11::Xmu X11::Xt
)
endif()
# It uses the X11 libs?
list(APPEND G4INTERFACES_COMMON_MODULE_LINK_LIBRARIES
X11::SM X11::ICE X11::X11 X11::Xext X11::Xmu X11::Xt
)
endif()
#
# Define the Geant4 Module.
#
GEANT4_DEFINE_MODULE(NAME G4UIcommon
HEADERS
${G4INTERFACES_COMMON_MODULE_HEADERS}
SOURCES
${G4INTERFACES_COMMON_MODULE_SOURCES}
GRANULAR_DEPENDENCIES
G4globman
G4intercoms
GLOBAL_DEPENDENCIES
G4global
G4intercoms
LINK_LIBRARIES
${G4INTERFACES_COMMON_MODULE_LINK_LIBRARIES}
geant4_define_module(NAME G4UIcommon
HEADERS
${G4INTERFACES_COMMON_MODULE_HEADERS}
SOURCES
${G4INTERFACES_COMMON_MODULE_SOURCES}
GRANULAR_DEPENDENCIES
G4globman
G4intercoms
GLOBAL_DEPENDENCIES
G4global
G4intercoms
LINK_LIBRARIES
${G4INTERFACES_COMMON_MODULE_LINK_LIBRARIES}
)
# List any source specific properties here