diff --git a/.gitignore b/.gitignore index cc9f10b..0aacd5b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ .zcompdump* keychain-config.zsh *.user.zsh - +*.start.zsh diff --git a/.zshrc b/.zshrc index 5e5cf92..cdca142 100644 --- a/.zshrc +++ b/.zshrc @@ -1,3 +1,5 @@ +[ -e $ZDOTDIR/env.start.zsh ] && source $ZDOTDIR/env.start.zsh + source $ZDOTDIR/env.zsh [ -e $ZDOTDIR/env.user.zsh ] && source $ZDOTDIR/env.user.zsh diff --git a/env.zsh b/env.zsh index 6db05bf..5e18028 100644 --- a/env.zsh +++ b/env.zsh @@ -14,9 +14,17 @@ export SVDIR=$HOME/sv UNCRUSTIFY_CONFIG="${XDG_CONFIG_HOME}/uncrustify/default.cfg" [ -e "${UNCRUSTIFY_CONFIG}" ] && export UNCRUSTIFY_CONFIG -# Настройка компилятора Intel (если установлен) -[ -e /opt/intel/bin/compilervars.sh ] && source /opt/intel/bin/compilervars.sh intel64 > /dev/null -[ -e /opt/intel/vtune_profiler/vtune-vars.sh ] && source /opt/intel/vtune_profiler/vtune-vars.sh > /dev/null -[ -e /opt/intel/inspector/inspxe-vars.sh ] && source /opt/intel/inspector/inspxe-vars.sh > /dev/null -[ -e /opt/intel/advisor/advixe-vars.sh ] && source /opt/intel/advisor/advixe-vars.sh > /dev/null +# Настройка Intel Studio +if [ ! -z ${ENABLE_INTEL_STUDIO+x} ]; then + #export COMPILERVARS_ARCHITECTURE=intel64 + #export COMPILERVARS_PLATFORM=linux + #/opt/intel/bin/iccvars.sh + INTEL_VARS=( /opt/intel/advisor/advixe-vars.sh + /opt/intel/inspector/inspxe-vars.sh + /opt/intel/vtune_profiler/vtune-vars.sh ) + + for f in ${INTEL_VARS[*]}; do + [ -e "$f" ] && source "$f" > /dev/null + done +fi