diff --git a/cmake/ETISSPlugin.cmake b/cmake/ETISSPlugin.cmake index a656bc1d8c..b1f9ee2600 100644 --- a/cmake/ETISSPlugin.cmake +++ b/cmake/ETISSPlugin.cmake @@ -11,12 +11,12 @@ MACRO(ETISSPlugin ProjName) INSTALL(CODE "FILE(APPEND \"${CMAKE_INSTALL_PREFIX}/lib/plugins/list.txt\" - \"${ProjName},\${CMAKE_INSTALL_PREFIX}/lib/plugins,${ProjName}\\n\" + \"${ProjName},./lib/plugins,${ProjName}\\n\" )" ) # mimicing installation in build tree as well - file(APPEND ${ETISS_BINARY_DIR}/lib/plugins/list.txt + file(APPEND ./lib/plugins/list.txt "${ProjName},${ETISS_BINARY_DIR}/lib/plugins,${ProjName}\n") ENDMACRO() diff --git a/src/bare_etiss_processor/run_helper.sh.in b/src/bare_etiss_processor/run_helper.sh.in index 27574e8391..8a723f67f8 100755 --- a/src/bare_etiss_processor/run_helper.sh.in +++ b/src/bare_etiss_processor/run_helper.sh.in @@ -2,7 +2,7 @@ set -e # Config -ETISS_DIR=@ETISS_DIR@ +ETISS_BIN_DIR=$(dirname -- "$(readlink -f -- "$0")") # Clear tmp file DYN_INI=$(mktemp /tmp/etiss_dynamic_XXXXXXXXXX.ini) @@ -30,7 +30,7 @@ TARGETSW_PATH_ELF=$1 TARGET_ELFFILE=$(basename -- "$TARGETSW_PATH_ELF") TARGET_ELFDIR=$(dirname -- "$TARGETSW_PATH_ELF") -VP_EXE="${ETISS_DIR}/bin/bare_etiss_processor" +VP_EXE="${ETISS_BIN_DIR}/bare_etiss_processor" CMD_OPTIONS="" @@ -100,7 +100,7 @@ echo -e "simple_mem_system.memseg_origin_01=0x00080000" >> $DYN_INI echo -e "simple_mem_system.memseg_length_01=0x00080000" >> $DYN_INI # Call -ARGS="-i${ETISS_DIR}/examples/base.ini -i${DYN_INI} ${CMD_OPTIONS}" +ARGS="-i${ETISS_BIN_DIR}/../examples/base.ini -i${DYN_INI} ${CMD_OPTIONS}" if [ "${USE_TGDB}" -eq 1 ]; then if [ "${DO_NOT_ATTACH}" -eq 0 ]; then