Skip to content

Commit cf60a3c

Browse files
committed
Downgrade to G4 10.0.3; fixes in filenames
1 parent 0cc392e commit cf60a3c

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
lines changed

hkinstall.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,15 @@ def __init__(self, path):
1212
super().__init__(path)
1313

1414
self._package_name = "Geant4"
15-
self._download_url = "https://gitlab.cern.ch/geant4/geant4/-/archive/v11.0.3/geant4-v11.0.3.zip"
15+
# self._download_url = "http://cern.ch/geant4-data/releases/geant4_10_01_p03.zip"
16+
17+
self._cmakelist_path = "source/4.10.01.p03"
1618

17-
self._cmakelist_path = "src/geant4-v11.0.3"
1819
self._cmake_options = {
1920
"WITH_TLS": "OFF",
2021
"GEANT4_INSTALL_DATA": "ON"
2122
}
22-
self._geant4_version="11.0.3" # overriding value defined by git for post_install
23+
self._geant4_version="10.1.3" # overriding value defined by git for post_install
2324

2425
def post_install(self):
2526
logger.info(f"Post-installation of {self._package_name} in progress...")
@@ -32,7 +33,7 @@ def post_install(self):
3233
src = f"{self._install_folder}/lib64/{self._package_name}-{self._geant4_version}"
3334
dst = f"{self._install_folder}/lib64/cmake"
3435
else:
35-
logger.error(f"Cannot find lib or lib64 subfolder!")
36+
logger.error(f"Cannot find lib/{self._package_name}-{self._geant4_version} or lib64/{self._package_name}-{self._geant4_version} subfolder in {self._install_folder}!")
3637
# return False
3738
logger.debug(f"Creating symlink between {src} and {dst}")
3839
if os.path.exists(dst):

source/4.10.01.p03/cmake/Modules/Geant4InstallData.cmake

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,8 @@
9999
# retrieving them globally
100100
#-----------------------------------------------------------------------
101101
# Geant4 Data Repository
102-
set(GEANT4_DATASETS_URL "http://geant4.cern.ch/support/source")
102+
#set(GEANT4_DATASETS_URL "http://geant4.cern.ch/support/source")
103+
set(GEANT4_DATASETS_URL "https://cern.ch/geant4-data/datasets")
103104

104105
# Where to install data in the build tree
105106
set(GEANT4_BUILD_FULL_DATADIR ${PROJECT_BINARY_DIR}/data)

0 commit comments

Comments
 (0)