From ddec9ce2c472b32de29bbac4578185b7e215372a Mon Sep 17 00:00:00 2001
From: Florian Uhlig <f.uhlig@gsi.de>
Date: Wed, 28 Sep 2022 10:41:38 +0200
Subject: [PATCH] Fix config file generation
---
cmake/modules/WriteConfigFile.cmake | 2 +-
cmake/scripts/config.csh.in | 2 +-
cmake/scripts/config.sh.in | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/cmake/modules/WriteConfigFile.cmake b/cmake/modules/WriteConfigFile.cmake
index e04b6fe678..f0854d2747 100644
--- a/cmake/modules/WriteConfigFile.cmake
+++ b/cmake/modules/WriteConfigFile.cmake
@@ -135,7 +135,7 @@ MACRO (WRITE_CONFIG_FILE filename)
CONVERT_LIST_TO_STRING(${PYTHONPATH})
SET(MY_PYTHONPATH ${output})
- SET (PATH ${ROOTSYS}/bin ${PATH})
+ SET (PATH ${ROOT_BINDIR} ${PATH})
UNIQUE(PATH "${PATH}")
CONVERT_LIST_TO_STRING(${PATH})
Set(MY_PATH ${output})
diff --git a/cmake/scripts/config.csh.in b/cmake/scripts/config.csh.in
index 9707c2868a..c7e23422d1 100644
--- a/cmake/scripts/config.csh.in
+++ b/cmake/scripts/config.csh.in
@@ -5,7 +5,7 @@ setenv System_ "@_system@"
. @_BINDIR@/check_system.csh
if ( "$same_system" == "1" ) then
setenv SIMPATH "@SIMPATH@"
- setenv ROOTSYS "@ROOTSYS@"
+ setenv ROOTSYS "@SIMPATH@"
setenv FAIRROOTPATH "@FAIRROOTPATH@"
if ( @FULL_CONFIG_FILE@ == true ) then
setenv Geant4_INCLUDE_DIRS "@Geant4_INCLUDE_DIRS@"
diff --git a/cmake/scripts/config.sh.in b/cmake/scripts/config.sh.in
index 5c70fe0775..17a26963af 100644
--- a/cmake/scripts/config.sh.in
+++ b/cmake/scripts/config.sh.in
@@ -5,7 +5,7 @@ export System_="@_system@"
. @_BINDIR@/check_system.sh
if [ $same_system -eq 1 ]; then
export SIMPATH="@SIMPATH@"
- export ROOTSYS="@ROOTSYS@"
+ export ROOTSYS="@SIMPATH@"
export FAIRROOTPATH="@FAIRROOTPATH@"
if (@FULL_CONFIG_FILE@); then
export Geant4_INCLUDE_DIRS="@Geant4_INCLUDE_DIRS@"
--
GitLab