Import Geant4 11.3.0.beta source tree
This commit is contained in:
@@ -6,6 +6,14 @@ It must **not** be used as a substitute for writing good git commit messages!
|
||||
|
||||
-------------------------------------------------------------------------------
|
||||
|
||||
## 2024-04-30 Ben Morgan (vis_toolssg-V11-02-01)
|
||||
- Replace TOOLSSG vis driver variables that are just synonyms for more
|
||||
fundamental config options (e.g. GEANT4_USE_QT) with the underlying
|
||||
variable.
|
||||
|
||||
## 2024-01-11 Ben Morgan (vis_toolssg-V11-02-00)
|
||||
- Make Freetype a private dependency
|
||||
|
||||
## 2023-09-05 Ben Morgan (vis_toolssg-V11-01-12)
|
||||
- Set AUTOMOC property on module when Qt used.
|
||||
|
||||
|
||||
@@ -25,37 +25,48 @@ geant4_module_link_libraries(G4ToolsSG
|
||||
# Freetype support if selected
|
||||
if(GEANT4_USE_FREETYPE)
|
||||
geant4_module_compile_definitions(G4ToolsSG PRIVATE TOOLS_USE_FREETYPE)
|
||||
geant4_module_link_libraries(G4ToolsSG PUBLIC Freetype::Freetype)
|
||||
geant4_module_link_libraries(G4ToolsSG PRIVATE Freetype::Freetype)
|
||||
endif()
|
||||
|
||||
# X11 sources if selected
|
||||
if(GEANT4_USE_TOOLSSG_X11_GLES)
|
||||
geant4_module_sources(G4ToolsSG PUBLIC_HEADERS G4ToolsSGX11GLES.hh SOURCES G4ToolsSGX11GLES.cc)
|
||||
geant4_module_compile_definitions(G4ToolsSG PUBLIC G4VIS_USE_TOOLSSG_X11_GLES)
|
||||
endif()
|
||||
if(GEANT4_USE_OPENGL_X11)
|
||||
geant4_module_sources(G4ToolsSG
|
||||
PUBLIC_HEADERS
|
||||
G4ToolsSGX11GLES.hh
|
||||
G4ToolsSGX11ZB.hh
|
||||
SOURCES
|
||||
G4ToolsSGX11GLES.cc
|
||||
G4ToolsSGX11ZB.cc)
|
||||
|
||||
if(GEANT4_USE_TOOLSSG_X11_ZB)
|
||||
geant4_module_sources(G4ToolsSG PUBLIC_HEADERS G4ToolsSGX11ZB.hh SOURCES G4ToolsSGX11ZB.cc)
|
||||
geant4_module_compile_definitions(G4ToolsSG PUBLIC G4VIS_USE_TOOLSSG_X11_ZB)
|
||||
geant4_module_compile_definitions(G4ToolsSG
|
||||
PUBLIC
|
||||
G4VIS_USE_TOOLSSG_X11_GLES
|
||||
G4VIS_USE_TOOLSSG_X11_ZB)
|
||||
endif()
|
||||
|
||||
# Xt sources if selected
|
||||
if(GEANT4_USE_TOOLSSG_XT_GLES)
|
||||
geant4_module_sources(G4ToolsSG PUBLIC_HEADERS G4ToolsSGXtGLES.hh SOURCES G4ToolsSGXtGLES.cc)
|
||||
if(GEANT4_USE_XM)
|
||||
geant4_module_sources(G4ToolsSG
|
||||
PUBLIC_HEADERS
|
||||
G4ToolsSGXtGLES.hh
|
||||
G4ToolsSGXtZB.hh
|
||||
SOURCES
|
||||
G4ToolsSGXtGLES.cc
|
||||
G4ToolsSGXtZB.cc)
|
||||
|
||||
geant4_module_compile_definitions(G4ToolsSG
|
||||
PUBLIC G4VIS_USE_TOOLSSG_XT_GLES
|
||||
PRIVATE TOOLS_USE_GL_GL_H)
|
||||
PUBLIC
|
||||
G4VIS_USE_TOOLSSG_XT_GLES
|
||||
G4VIS_USE_TOOLSSG_XT_ZB
|
||||
PRIVATE
|
||||
TOOLS_USE_GL_GL_H)
|
||||
|
||||
geant4_module_link_libraries(G4ToolsSG PRIVATE G4UIimplementation)
|
||||
endif()
|
||||
|
||||
if(GEANT4_USE_TOOLSSG_XT_ZB)
|
||||
geant4_module_sources(G4ToolsSG PUBLIC_HEADERS G4ToolsSGXtZB.hh SOURCES G4ToolsSGXtZB.cc)
|
||||
geant4_module_compile_definitions(G4ToolsSG PUBLIC G4VIS_USE_TOOLSSG_XT_ZB)
|
||||
geant4_module_link_libraries(G4ToolsSG PRIVATE G4UIimplementation)
|
||||
endif()
|
||||
|
||||
# X11/Xt links if selected
|
||||
if(GEANT4_USE_TOOLSSG_X11_GLES OR GEANT4_USE_TOOLSSG_XT_GLES)
|
||||
if(GEANT4_USE_OPENGL_X11 OR GEANT4_USE_XM)
|
||||
geant4_module_link_libraries(G4ToolsSG PRIVATE X11::SM X11::ICE X11::X11 X11::Xext X11::Xmu)
|
||||
if(APPLE)
|
||||
geant4_module_link_libraries(G4ToolsSG PRIVATE XQuartzGL::GL)
|
||||
@@ -64,22 +75,25 @@ if(GEANT4_USE_TOOLSSG_X11_GLES OR GEANT4_USE_TOOLSSG_XT_GLES)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
if(GEANT4_USE_TOOLSSG_X11_ZB OR GEANT4_USE_TOOLSSG_XT_ZB)
|
||||
geant4_module_link_libraries(G4ToolsSG PRIVATE X11::SM X11::ICE X11::X11 X11::Xext X11::Xmu)
|
||||
endif()
|
||||
|
||||
# Qt sources/links if selected
|
||||
if(GEANT4_USE_TOOLSSG_QT_GLES)
|
||||
if(GEANT4_USE_QT)
|
||||
geant4_module_sources(G4ToolsSG
|
||||
PUBLIC_HEADERS
|
||||
G4ToolsSGQtGLES.hh
|
||||
G4ToolsSGQtZB.hh
|
||||
PRIVATE_HEADERS
|
||||
G4ToolsSGQtGLESViewer.hh
|
||||
G4ToolsSGQtZBViewer.hh
|
||||
SOURCES
|
||||
G4ToolsSGQtGLES.cc
|
||||
G4ToolsSGQtGLESViewer.cc)
|
||||
G4ToolsSGQtGLESViewer.cc
|
||||
G4ToolsSGQtZB.cc
|
||||
G4ToolsSGQtZBViewer.cc)
|
||||
|
||||
geant4_module_compile_definitions(G4ToolsSG PUBLIC G4VIS_USE_TOOLSSG_QT_GLES)
|
||||
geant4_module_compile_definitions(G4ToolsSG
|
||||
PUBLIC
|
||||
G4VIS_USE_TOOLSSG_QT_GLES
|
||||
G4VIS_USE_TOOLSSG_QT_ZB)
|
||||
|
||||
geant4_module_link_libraries(G4ToolsSG
|
||||
PRIVATE
|
||||
@@ -103,43 +117,14 @@ if(GEANT4_USE_TOOLSSG_QT_GLES)
|
||||
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/private>)
|
||||
endif()
|
||||
|
||||
if(GEANT4_USE_TOOLSSG_QT_ZB)
|
||||
geant4_module_sources(G4ToolsSG
|
||||
PUBLIC_HEADERS
|
||||
G4ToolsSGQtZB.hh
|
||||
PRIVATE_HEADERS
|
||||
G4ToolsSGQtZBViewer.hh
|
||||
SOURCES
|
||||
G4ToolsSGQtZB.cc
|
||||
G4ToolsSGQtZBViewer.cc)
|
||||
|
||||
geant4_module_compile_definitions(G4ToolsSG PUBLIC G4VIS_USE_TOOLSSG_QT_ZB)
|
||||
|
||||
geant4_module_link_libraries(G4ToolsSG
|
||||
PRIVATE
|
||||
Qt${QT_VERSION_MAJOR}::Gui
|
||||
Qt${QT_VERSION_MAJOR}::Widgets
|
||||
G4UIimplementation)
|
||||
|
||||
geant4_set_module_property(G4ToolsSG PROPERTY AUTOMOC ON)
|
||||
|
||||
# Minor hack for MOC-ing. Qt's moc requires visibility of the private headers
|
||||
# - Will not affect external consumers and should be minimal impact interanally
|
||||
# as this is a leaf category
|
||||
geant4_module_include_directories(G4ToolsSG
|
||||
PRIVATE
|
||||
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/private>)
|
||||
endif()
|
||||
|
||||
# Windows sources if selected
|
||||
if(GEANT4_USE_TOOLSSG_WINDOWS_GLES)
|
||||
if(GEANT4_USE_OPENGL_WIN32)
|
||||
geant4_module_sources(G4ToolsSG PUBLIC_HEADERS G4ToolsSGWindowsGLES.hh SOURCES G4ToolsSGWindowsGLES.cc)
|
||||
geant4_module_compile_definitions(G4ToolsSG PUBLIC G4VIS_USE_TOOLSSG_WINDOWS_GLES)
|
||||
geant4_module_link_libraries(G4ToolsSG PRIVATE OpenGL::GL)
|
||||
endif()
|
||||
|
||||
if(GEANT4_USE_TOOLSSG_WINDOWS_ZB)
|
||||
if(WIN32)
|
||||
geant4_module_sources(G4ToolsSG PUBLIC_HEADERS G4ToolsSGWindowsZB.hh SOURCES G4ToolsSGWindowsZB.cc)
|
||||
geant4_module_compile_definitions(G4ToolsSG PUBLIC G4VIS_USE_TOOLSSG_WINDOWS_ZB)
|
||||
endif()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user