Skip to content
Snippets Groups Projects
Commit ddec9ce2 authored by Administrator's avatar Administrator
Browse files

Fix config file generation

parent 4268aec2
No related branches found
No related tags found
1 merge request!957Use modern CMake FindPackage config
Pipeline #19138 passed
...@@ -135,7 +135,7 @@ MACRO (WRITE_CONFIG_FILE filename) ...@@ -135,7 +135,7 @@ MACRO (WRITE_CONFIG_FILE filename)
CONVERT_LIST_TO_STRING(${PYTHONPATH}) CONVERT_LIST_TO_STRING(${PYTHONPATH})
SET(MY_PYTHONPATH ${output}) SET(MY_PYTHONPATH ${output})
SET (PATH ${ROOTSYS}/bin ${PATH}) SET (PATH ${ROOT_BINDIR} ${PATH})
UNIQUE(PATH "${PATH}") UNIQUE(PATH "${PATH}")
CONVERT_LIST_TO_STRING(${PATH}) CONVERT_LIST_TO_STRING(${PATH})
Set(MY_PATH ${output}) Set(MY_PATH ${output})
......
...@@ -5,7 +5,7 @@ setenv System_ "@_system@" ...@@ -5,7 +5,7 @@ setenv System_ "@_system@"
. @_BINDIR@/check_system.csh . @_BINDIR@/check_system.csh
if ( "$same_system" == "1" ) then if ( "$same_system" == "1" ) then
setenv SIMPATH "@SIMPATH@" setenv SIMPATH "@SIMPATH@"
setenv ROOTSYS "@ROOTSYS@" setenv ROOTSYS "@SIMPATH@"
setenv FAIRROOTPATH "@FAIRROOTPATH@" setenv FAIRROOTPATH "@FAIRROOTPATH@"
if ( @FULL_CONFIG_FILE@ == true ) then if ( @FULL_CONFIG_FILE@ == true ) then
setenv Geant4_INCLUDE_DIRS "@Geant4_INCLUDE_DIRS@" setenv Geant4_INCLUDE_DIRS "@Geant4_INCLUDE_DIRS@"
......
...@@ -5,7 +5,7 @@ export System_="@_system@" ...@@ -5,7 +5,7 @@ export System_="@_system@"
. @_BINDIR@/check_system.sh . @_BINDIR@/check_system.sh
if [ $same_system -eq 1 ]; then if [ $same_system -eq 1 ]; then
export SIMPATH="@SIMPATH@" export SIMPATH="@SIMPATH@"
export ROOTSYS="@ROOTSYS@" export ROOTSYS="@SIMPATH@"
export FAIRROOTPATH="@FAIRROOTPATH@" export FAIRROOTPATH="@FAIRROOTPATH@"
if (@FULL_CONFIG_FILE@); then if (@FULL_CONFIG_FILE@); then
export Geant4_INCLUDE_DIRS="@Geant4_INCLUDE_DIRS@" export Geant4_INCLUDE_DIRS="@Geant4_INCLUDE_DIRS@"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment