Import Geant4 11.0.0 source tree

source/interfaces/basic/sources.cmake

@@ -32,7 +32,8 @@ if(MSVC)
   list(APPEND G4INTERFACES_BASIC_MODULE_HEADERS G4UIWin32.hh)
   list(APPEND G4INTERFACES_BASIC_MODULE_SOURCES G4UIWin32.cc)
 
-  list(APPEND G4INTERFACES_BASIC_MODULE_COMPILE_DEFINITIONS G4UI_BUILD_WIN32_SESSION G4INTY_BUILD_WIN32)
+  # Definition required by G4UIexecutive
+  list(APPEND G4INTERFACES_BASIC_MODULE_COMPILE_DEFINITIONS G4UI_BUILD_WIN32_SESSION)
 endif()
 
 # Qt only if selected.
@@ -40,9 +41,8 @@ if(GEANT4_USE_QT)
   list(APPEND G4INTERFACES_BASIC_MODULE_HEADERS G4UIQt.hh)
   list(APPEND G4INTERFACES_BASIC_MODULE_SOURCES G4UIQt.cc)
 
-  # Add the definitions
-  # We have to also add in G4INTY_BUILD_QT 'cause G4QT header needs that...
-  list(APPEND G4INTERFACES_BASIC_MODULE_COMPILE_DEFINITIONS G4UI_BUILD_QT_SESSION G4INTY_BUILD_QT)
+  # Add the definition required by G4UIexecutive
+  list(APPEND G4INTERFACES_BASIC_MODULE_COMPILE_DEFINITIONS G4UI_BUILD_QT_SESSION)
 
   # Add the extra libraries
   list(APPEND G4INTERFACES_BASIC_MODULE_LINK_LIBRARIES Qt5::Gui Qt5::Widgets Qt5::Core)
@@ -53,8 +53,8 @@ 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
-  list(APPEND G4INTERFACES_BASIC_MODULE_COMPILE_DEFINITIONS G4UI_BUILD_XM_SESSION G4INTY_BUILD_XT)
+  # Add the compile definition needed by G4UIexecutive
+  list(APPEND G4INTERFACES_BASIC_MODULE_COMPILE_DEFINITIONS G4UI_BUILD_XM_SESSION)
 
   # Need the X11 and Motif libraries
   list(APPEND G4INTERFACES_BASIC_MODULE_LINK_LIBRARIES
@@ -78,9 +78,7 @@ geant4_module_link_libraries(G4UIbasic
     G4intercoms
     G4globman
     ${G4INTERFACES_BASIC_MODULE_LINK_LIBRARIES}
-    ${timemory_LIBRARIES}
-  PRIVATE
-    G4UIGAG)
+    ${timemory_LIBRARIES})
 
 # List any source specific properties here
 if(MSVC)