ECC-106 Use ECCODES_{DEFINITION,SAMPLES}_SUFF in example scripts

This commit is contained in:
Florian Rathgeber 2017-02-03 13:49:24 +00:00
parent 35f91f1e99
commit 32c8dc9325
3 changed files with 6 additions and 6 deletions

View File

@ -11,7 +11,7 @@ proj_dir=@PROJECT_SOURCE_DIR@
data_dir=@PROJECT_BINARY_DIR@/data data_dir=@PROJECT_BINARY_DIR@/data
# use definitions from binary dir to test if installation will be correct # use definitions from binary dir to test if installation will be correct
def_dir="@CMAKE_BINARY_DIR@/share/@PROJECT_NAME@/definitions" def_dir="@CMAKE_BINARY_DIR@/@ECCODES_DEFINITION_SUFF@"
ECCODES_DEFINITION_PATH="${def_dir}" ECCODES_DEFINITION_PATH="${def_dir}"
export ECCODES_DEFINITION_PATH export ECCODES_DEFINITION_PATH
@ -26,6 +26,6 @@ if test "x$ECCODES_TEST_WITH_VALGRIND" != "x"; then
fi fi
# use samples from binary dir to test if installation will be correct # use samples from binary dir to test if installation will be correct
samp_dir="@CMAKE_BINARY_DIR@/share/@PROJECT_NAME@/samples" samp_dir="@CMAKE_BINARY_DIR@/@ECCODES_SAMPLES_SUFF@"
ECCODES_SAMPLES_PATH=${samp_dir} ECCODES_SAMPLES_PATH=${samp_dir}
export ECCODES_SAMPLES_PATH export ECCODES_SAMPLES_PATH

View File

@ -11,7 +11,7 @@ proj_dir=@PROJECT_SOURCE_DIR@
data_dir=@PROJECT_BINARY_DIR@/data data_dir=@PROJECT_BINARY_DIR@/data
# use definitions from binary dir to test if installation will be correct # use definitions from binary dir to test if installation will be correct
def_dir="@CMAKE_BINARY_DIR@/share/@PROJECT_NAME@/definitions" def_dir="@CMAKE_BINARY_DIR@/@ECCODES_DEFINITION_SUFF@"
ECCODES_DEFINITION_PATH="${def_dir}" ECCODES_DEFINITION_PATH="${def_dir}"
export ECCODES_DEFINITION_PATH export ECCODES_DEFINITION_PATH
@ -26,6 +26,6 @@ if test "x$ECCODES_TEST_WITH_VALGRIND" != "x"; then
fi fi
# use samples from binary dir to test if installation will be correct # use samples from binary dir to test if installation will be correct
samp_dir="@CMAKE_BINARY_DIR@/share/@PROJECT_NAME@/samples" samp_dir="@CMAKE_BINARY_DIR@/@ECCODES_SAMPLES_SUFF@"
ECCODES_SAMPLES_PATH=${samp_dir} ECCODES_SAMPLES_PATH=${samp_dir}
export ECCODES_SAMPLES_PATH export ECCODES_SAMPLES_PATH

View File

@ -10,7 +10,7 @@ fi
data_dir=@PROJECT_BINARY_DIR@/data data_dir=@PROJECT_BINARY_DIR@/data
# use definitions from binary dir to test if installation will be correct # use definitions from binary dir to test if installation will be correct
def_dir="@CMAKE_BINARY_DIR@/share/@PROJECT_NAME@/definitions" def_dir="@CMAKE_BINARY_DIR@/@ECCODES_DEFINITION_SUFF@"
ECCODES_DEFINITION_PATH="${def_dir}" ECCODES_DEFINITION_PATH="${def_dir}"
export ECCODES_DEFINITION_PATH export ECCODES_DEFINITION_PATH
@ -19,7 +19,7 @@ examples_dir=@CMAKE_CURRENT_BINARY_DIR@/
examples_src=@CMAKE_CURRENT_SOURCE_DIR@/ examples_src=@CMAKE_CURRENT_SOURCE_DIR@/
# use samples from binary dir to test if installation will be correct # use samples from binary dir to test if installation will be correct
samp_dir="@CMAKE_BINARY_DIR@/share/@PROJECT_NAME@/samples" samp_dir="@CMAKE_BINARY_DIR@/@ECCODES_SAMPLES_SUFF@"
ECCODES_SAMPLES_PATH=${samp_dir} ECCODES_SAMPLES_PATH=${samp_dir}
export ECCODES_SAMPLES_PATH export ECCODES_SAMPLES_PATH