Skip to content
Snippets Groups Projects
Commit 977779d0 authored by Ewelina Maria Lobodzinska's avatar Ewelina Maria Lobodzinska Committed by Graeme Stewart
Browse files

fix warnings (Rivet-02-04-02-04)

parent d58922b2
No related branches found
No related tags found
No related merge requests found
THIS IS A DUMMY. CMAKE CONFIG NEEDS TO BE WRITTEN
......@@ -14,10 +14,11 @@ use YODA YODA-* External
#macro LCG_ROOT "/afs/.cern.ch/sw/lcg"
#macro LCG_external "$(LCG_ROOT)/external"
macro myLCG_config_version "67c"
#macro myLCG_config_version ""
macro Rivet_home "$(LCG_external)/MCGenerators_lcgcmt$(myLCG_config_version)/rivet"
#macro Rivet_home "$(LCG_external)/MCGenerators/rivet"
macro Rivet_version "2.4.0"
macro Rivet_version "2.4.2"
macro Rivet_native_version "$(Rivet_version)_lcgcmt$(LCG_config_version)"
macro Rivet_dir "$(Rivet_home)/$(Rivet_version)/$(LCG_ext_system)"
macro Rivet_lib "$(Rivet_dir)/lib"
......@@ -40,7 +41,9 @@ include_path $(Rivet_dir)/include
include_dirs $(Rivet_dir)/include
## Install scripts
apply_pattern declare_scripts files=" -s=$(Rivet_bin) *"
apply_pattern declare_scripts files=" -s=$(Rivet_bin) * -s=../scripts *"
#apply_pattern declare_scripts files=" -s=$(Rivet_bin) *"
#apply_pattern declare_scripts files=" -s=../scripts rivet-buildplugin-atlas rivet-config-atlas"
path_prepend PATH "$(Rivet_bin)"
## Install Python modules
......@@ -48,6 +51,9 @@ apply_pattern generic_declare_for_link kind=python_modules \
files='-s=$(Rivet_python) * *.py *.so' prefix="$(CMTCONFIG)/lib/python$(Python_version)" name=rivet_pymodules
path_prepend PYTHONPATH "$(Rivet_python)"
## Set paths to find default plugins and data files
path_append RIVET_ANALYSIS_PATH "$(Rivet_share)"
## Set TeX environment for Rivet plotting
set colon ':'
path_prepend TEXMFHOME "$(Rivet_texmf)"
......@@ -61,5 +67,3 @@ path_append TEXINPUTS $colon
path_append LATEXINPUTS $colon
macro Rivet_pp_cppflags "-isystem $(Rivet_dir)/include "
#! /usr/bin/env bash
cmd=$( (rivet-buildplugin --cmd $@ 2> /dev/null) | \
sed -e "s:/afs/cern.ch/sw/lcg/releases/\([^-]\+\)-.*/$CMTCONFIG:$SITEROOT/sw/lcg/releases/LCG_$LCGCMTVERS/\1/$CMTCONFIG:g")
if [[ -n "$cmd" ]]; then
echo $cmd
exec $cmd
else
echo "Problem getting/modifying build command from rivet-buildplugin" 1>&2
exit 1
fi
#! /usr/bin/env bash
exec rivet-config --guess-prefix $@
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