Import Geant4 10.6.0.beta source tree

2019-06-28 11:59:04 +02:00
parent 28a70706e0
commit d0f911957d
1056 changed files with 95168 additions and 78160 deletions
@@ -17,6 +17,9 @@ committal in the CVS repository !
     * Reverse chronological order (last date on top), please *
     ----------------------------------------------------------

+20 February 2019 Ben Morgan (visexternals-V10-05-00)
+- visexternalgl2ps-V10-05-00: Add include path for generated G4GlobalConfig.hh
+
 28 May 2018  Gabriele Cosmo  (visexternals-V10-04-01)
 - visexternalgl2ps-V10-04-01: Corrected GNUmakefile, now requiring dependency
  on global module.
@@ -16,6 +16,9 @@ committal in the CVS repository !
     * Reverse chronological order (last date on top), please *
     ----------------------------------------------------------

+20 February 2019 Ben Morgan (visexternalgl2ps-V10-05-00)
+- Add include path for generated G4GlobalConfig.hh
+
 28 May 2018  Gabriele Cosmo  (visexternalgl2ps-V10-04-01)
 - Corrected GNUmakefile, now requiring dependency on global module.

@@ -19,7 +19,11 @@ include_directories(${CLHEP_INCLUDE_DIRS})
 include_directories(${ZLIB_INCLUDE_DIRS})

 # List internal includes needed.
-include_directories(${CMAKE_SOURCE_DIR}/source/global/management/include)
+include_directories(${PROJECT_SOURCE_DIR}/source/global/management/include)
+# WORKAROUND: Now have a generated header, so must add include directory,
+# but not that we lose one directory level because the management subcategory
+# is merged into the main global one!
+include_directories(${PROJECT_BINARY_DIR}/source/global/include)

 # Must have GL headers available
 include_directories(${OPENGL_INCLUDE_DIR})