File tree Expand file tree Collapse file tree 2 files changed +16
-6
lines changed Expand file tree Collapse file tree 2 files changed +16
-6
lines changed Original file line number Diff line number Diff line change @@ -446,7 +446,8 @@ if(LINUX
446
446
COMMAND
447
447
${UMF_CMAKE_SOURCE_DIR} /test/test_examples.sh
448
448
${UMF_CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR}
449
- ${CMAKE_INSTALL_PREFIX} ${EXAMPLES}
449
+ ${CMAKE_CURRENT_BINARY_DIR} /umf_standalone_examples/install-dir
450
+ "${CMAKE_INSTALL_PREFIX} " ${EXAMPLES}
450
451
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} )
451
452
endif ()
452
453
endif ()
Original file line number Diff line number Diff line change 8
8
SOURCE_DIR=$1
9
9
BUILD_DIR=$2
10
10
INSTALL_DIR=$3
11
+ CMAKE_INSTALL_PREFIX=$4
11
12
12
13
echo " Running: $0 $* "
13
14
14
15
function print_usage() {
15
16
echo " $( basename $0 ) - test all examples standalone"
16
- echo " Usage: $( basename $0 ) <source_dir> <build_dir> <install_dir> <list-of-examples-to-run>"
17
+ echo " Usage: $( basename $0 ) <source_dir> <build_dir> <install_dir> <CMAKE_INSTALL_PREFIX> < list-of-examples-to-run>"
17
18
}
18
19
20
+ # CMAKE_INSTALL_PREFIX can be the empty string ""
19
21
if [ " $3 " == " " ]; then
20
22
print_usage
21
23
echo -e " Error: too few arguments\n"
22
24
exit 1
23
25
fi
24
26
25
- if [ " $4 " == " " ]; then
27
+ if [ " $5 " == " " ]; then
26
28
print_usage
27
29
echo " No examples to run!"
28
30
exit 0
@@ -34,11 +36,18 @@ if [ ! -f $SOURCE_DIR/README.md ]; then
34
36
exit 1
35
37
fi
36
38
39
+ [ ! -d ${INSTALL_DIR} /${CMAKE_INSTALL_PREFIX} ] && mkdir -p ${INSTALL_DIR} /${CMAKE_INSTALL_PREFIX}
40
+
37
41
SOURCE_DIR=$( realpath $SOURCE_DIR )
38
42
BUILD_DIR=$( realpath $BUILD_DIR )
39
43
INSTALL_DIR=$( realpath $INSTALL_DIR )
40
44
41
- shift 3
45
+ echo " SOURCE_DIR=$SOURCE_DIR "
46
+ echo " BUILD_DIR=$BUILD_DIR "
47
+ echo " CMAKE_INSTALL_PREFIX=$CMAKE_INSTALL_PREFIX "
48
+ echo " INSTALL_DIR=$INSTALL_DIR "
49
+
50
+ shift 4
42
51
EXAMPLES=" $* "
43
52
echo " Examples to run: $EXAMPLES "
44
53
echo
@@ -47,7 +56,7 @@ cd ${BUILD_DIR}
47
56
echo " DIR=$( pwd) "
48
57
49
58
set -x
50
- make -j$( nproc) install
59
+ make DESTDIR= $INSTALL_DIR -j$( nproc) install
51
60
set +x
52
61
53
62
for ex in $EXAMPLES ; do
@@ -67,7 +76,7 @@ for ex in $EXAMPLES; do
67
76
rm -rf $BLD_DIR
68
77
mkdir -p $BLD_DIR
69
78
cd $BLD_DIR
70
- CMAKE_PREFIX_PATH=" $INSTALL_DIR " cmake $SRC_DIR
79
+ CMAKE_PREFIX_PATH=" ${ INSTALL_DIR} / ${CMAKE_INSTALL_PREFIX} " cmake $SRC_DIR
71
80
make -j$( nproc)
72
81
ctest --output-on-failure
73
82
set +x
You can’t perform that action at this time.
0 commit comments