Import Geant4 11.0.0.beta source tree

source/interfaces/common/sources.cmake

@@ -1,11 +1,6 @@
-#------------------------------------------------------------------------------
-# Module : G4UIcommon
-# Package: Geant4.src.G4interfaces.G4UIcommon
-#------------------------------------------------------------------------------
+# - G4UIcommon module build definition
 
-#
 # Module has optional sources
-#
 
 # List those always built
 set(G4INTERFACES_COMMON_MODULE_HEADERS
@@ -21,40 +16,21 @@ set(G4INTERFACES_COMMON_MODULE_SOURCES
   G4VInteractorManager.cc)
 
 set(G4INTERFACES_COMMON_MODULE_LINK_LIBRARIES )
+set(G4INTERFACES_COMMON_MODULE_COMPILE_DEFINITIONS )
 
 # 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...
-  add_definitions(-DG4INTY_BUILD_QT)
+  list(APPEND G4INTERFACES_COMMON_MODULE_COMPILE_DEFINITIONS G4INTY_BUILD_QT)
 
   # It uses Qt core and gui(?) libs
   list(APPEND G4INTERFACES_COMMON_MODULE_LINK_LIBRARIES
     Qt5::Gui Qt5::Core)
 endif()
 
-#
-# 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()
-
 # Win32 option - always built when we're using MSVC
 if(MSVC)
   # Add the sources
@@ -62,7 +38,7 @@ if(MSVC)
   list(APPEND G4INTERFACES_COMMON_MODULE_SOURCES G4Win32.cc)
 
   # Add the needed compile definitions to these sources
-  add_definitions(-DG4INTY_BUILD_WIN32)
+  list(APPEND G4INTERFACES_COMMON_MODULE_COMPILE_DEFINITIONS G4INTY_BUILD_WIN32)
 endif()
 
 # X11 options - we only need this for Xm (and Inventor, which activates XM)
@@ -72,7 +48,7 @@ if(UNIX AND GEANT4_USE_XM)
   list(APPEND G4INTERFACES_COMMON_MODULE_SOURCES G4Xt.cc)
 
   # Source needs to have a compile definition
-  add_definitions(-DG4INTY_BUILD_XT)
+  list(APPEND G4INTERFACES_COMMON_MODULE_COMPILE_DEFINITIONS G4INTY_BUILD_XT)
 
   # It uses the X11 libs?
   list(APPEND G4INTERFACES_COMMON_MODULE_LINK_LIBRARIES
@@ -80,22 +56,19 @@ if(UNIX AND GEANT4_USE_XM)
   )
 endif()
 
-#
 # Define the Geant4 Module.
-#
-geant4_define_module(NAME G4UIcommon
-  HEADERS
+geant4_add_module(G4UIcommon
+  PUBLIC_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}
-)
+    ${G4INTERFACES_COMMON_MODULE_SOURCES})
 
-# List any source specific properties here
+geant4_module_compile_definitions(G4UIcommon
+  PRIVATE ${G4INTERFACES_COMMON_MODULE_COMPILE_DEFINITIONS})
+
+geant4_module_link_libraries(G4UIcommon
+  PUBLIC
+    G4intercoms
+    G4globman
+    # These are PUBLIC until use in client code better understood
+    ${G4INTERFACES_COMMON_MODULE_LINK_LIBRARIES})