Find G4INCL path and export G4INCLDATA variable.

FairRootGroup · Jun 18, 2019 · 0a45995 · 0a45995
1 parent 2f2391b
commit 0a45995
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 0 deletions.
diff --git a/cmake/modules/WriteConfigFile.cmake b/cmake/modules/WriteConfigFile.cmake
@@ -129,6 +129,9 @@ MACRO (WRITE_CONFIG_FILE filename)
   CONVERT_LIST_TO_STRING(${G4REALSURFACEDATA})
   Set(G4REALSURFACEDATA ${output})
 
+  CONVERT_LIST_TO_STRING(${G4INCLDATA})
+  Set(G4INCLDATA ${output})
+
   CONVERT_LIST_TO_STRING(${CLHEP_INCLUDE_DIR})
   Set(CLHEP_INCLUDE_DIR ${output})
 

diff --git a/cmake/modules_old/FindGEANT4DATA.cmake b/cmake/modules_old/FindGEANT4DATA.cmake
@@ -183,3 +183,17 @@ If (G4ENSDFSTATEDATA)
 Else (G4ENSDFSTATEDATA)
   Message(STATUS "NOT Found G4ENSDFSTATE data")
 EndIf (G4ENSDFSTATEDATA)
+
+
+  FIND_PATH(G4INCLDATA NAMES README PATHS
+    $ENV{G4INCLDATA}
+    ${GEANT4_DATA}/G4INCL
+    NO_DEFAULT_PATH
+  )
+
+If (G4INCLDATA)
+  Message(STATUS "Found G4INCL data")
+Else (G4INCLDATA)
+  Message(STATUS "NOT Found G4INCL data")
+EndIf (G4INCLDATA)
+
diff --git a/cmake/scripts/config.csh.in b/cmake/scripts/config.csh.in
@@ -37,6 +37,7 @@ if ( "$same_system" == "1" ) then
 		setenv G4REALSURFACEDATA "@G4REALSURFACEDATA@"
 		setenv G4SAIDXSDATA "@G4SAIDXSDATA@"
 		setenv G4ENSDFSTATEDATA "@G4ENSDFSTATEDATA@"
+    setenv G4INCLDATA "@G4INCLDATA@"
 	endif
 	setenv ROOT_LIBRARY_DIR "@ROOT_LIBRARY_DIR@"
 	setenv ROOT_LIBRARIES "@ROOT_LIBRARIES@"

diff --git a/cmake/scripts/config.sh.in b/cmake/scripts/config.sh.in
@@ -38,6 +38,7 @@ if [ $same_system -eq 1 ]; then
 		export G4REALSURFACEDATA="@G4REALSURFACEDATA@"
 		export G4SAIDXSDATA="@G4SAIDXSDATA@"
 		export G4ENSDFSTATEDATA="@G4ENSDFSTATEDATA@"
+    export G4INCLDATA="@G4INCLDATA@"
 	fi
 	export ROOT_LIBRARY_DIR="@ROOT_LIBRARY_DIR@"
 	export ROOT_LIBRARIES="@ROOT_LIBRARIES@"

diff --git a/cmake/scripts/root_macro.sh.in b/cmake/scripts/root_macro.sh.in
@@ -29,6 +29,7 @@ export G4RADIOACTIVEDATA="@G4RADIOACTIVEDATA@"
 export G4REALSURFACEDATA="@G4REALSURFACEDATA@"
 export G4SAIDXSDATA="@G4SAIDXSDATA@"
 export G4ENSDFSTATEDATA="@G4ENSDFSTATEDATA@"
+export G4INCLDATA="@G4INCLDATA@"
 export G3SYS="@GEANT3_SYSTEM_DIR@"
 export PYTHIA8DATA="@PYTHIA8DATA@"
 if [ -e @Geant4_DIR@/env.sh ]; then

diff --git a/cmake/scripts/run_binary.sh.in b/cmake/scripts/run_binary.sh.in
@@ -33,5 +33,6 @@ export G4RADIOACTIVEDATA=@G4RADIOACTIVEDATA@
 export G4REALSURFACEDATA=@G4REALSURFACEDATA@
 export G4SAIDXSDATA="@G4SAIDXSDATA@"
 export G4ENSDFSTATEDATA="@G4ENSDFSTATEDATA@"
+export G4INCLDATA="@G4INCLDATA@"
 
 @my_exe_name@