OilfieldToolsNet/IFEM
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changed: install main module whether we build downstreams or not

Browse Source
This commit is contained in:
Arne Morten Kvarving 2018-02-01 10:50:59 +01:00
parent 3b7dc7afdc
commit fc56a25645
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jenkins/build-ifem-module.sh
View File

@ -182,11 +182,6 @@ function build_upstreams {
function build_downstreams {
for BTYPE in "${!BTYPES_ARRAY[@]}"
do
pushd .
cd $WORKSPACE/${BTYPES_ARRAY[$BTYPE]}/build-$1
cmake --build . --target install
popd
egrep_cmd="xml_grep --wrap testsuites --cond testsuite $WORKSPACE/${BTYPES_ARRAY[$BTYPE]}/build-$1/testoutput.xml"
for downstream in ${downstreams[*]}
do
@ -252,6 +247,7 @@ function build_module_and_upstreams {
cd ${BTYPES_ARRAY[$BTYPE]}/build-$1
build_module "-DCMAKE_INSTALL_PREFIX=$WORKSPACE/${BTYPES_ARRAY[$BTYPE]}/install -DCMAKE_PREFIX_PATH=$WORKSPACE/${BTYPES_ARRAY[$BTYPE]}/install -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}" 1 $WORKSPACE/deps/${MODULE_EXTRA_DIR[$1]}$1/${MODULE_APP_DIR[$1]}
test $? -eq 0 || exit 1
cmake --build . --target install
popd
# Add testsuite names