#1609 clean up workspace before compiling vt-sample-project with vt a…

…s TPL
DARMA-tasking · Nov 16, 2021 · 4620ef2 · 4620ef2
1 parent d5b21bb
commit 4620ef2
Showing 1 changed file with 22 additions and 7 deletions.
diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh
@@ -55,12 +55,13 @@ else
       git clone -b "${detector_rev}" --depth 1 https://github.com/DARMA-tasking/detector.git
       export DETECTOR=$PWD/detector
       export DETECTOR_BUILD=${build_dir}/detector
+      export DETECTOR_INSTALL=${DETECTOR_BUILD}/install
       mkdir -p "$DETECTOR_BUILD"
       cd "$DETECTOR_BUILD"
       mkdir build
       cd build
       cmake -G "${CMAKE_GENERATOR:-Ninja}" \
-            -DCMAKE_INSTALL_PREFIX="$DETECTOR_BUILD/install" \
+            -DCMAKE_INSTALL_PREFIX="$DETECTOR_INSTALL" \
             "$DETECTOR"
       cmake --build . --target install
     fi
@@ -79,13 +80,14 @@ else
         git clone -b "${checkpoint_rev}" --depth 1 https://github.com/DARMA-tasking/checkpoint.git
         export CHECKPOINT=$PWD/checkpoint
         export CHECKPOINT_BUILD=${build_dir}/checkpoint
+        export CHECKPOINT_INSTALL=${CHECKPOINT_BUILD}/install
         mkdir -p "$CHECKPOINT_BUILD"
         cd "$CHECKPOINT_BUILD"
         mkdir build
         cd build
         cmake -G "${CMAKE_GENERATOR:-Ninja}" \
-              -DCMAKE_INSTALL_PREFIX="$CHECKPOINT_BUILD/install" \
-              -Ddetector_DIR="$DETECTOR_BUILD/install" \
+              -DCMAKE_INSTALL_PREFIX="$CHECKPOINT_INSTALL" \
+              -Ddetector_DIR="$DETECTOR_INSTALL" \
               "$CHECKPOINT"
         cmake --build . --target install
     fi
@@ -98,6 +100,7 @@ fi
 
 export VT=${source_dir}
 export VT_BUILD=${build_dir}/vt
+export VT_INSTALL=${VT_BUILD}/install
 mkdir -p "$VT_BUILD"
 cd "$VT_BUILD"
 rm -Rf ./*
@@ -134,10 +137,10 @@ cmake -G "${CMAKE_GENERATOR:-Ninja}" \
       -DCMAKE_CXX_COMPILER="${CXX:-c++}" \
       -DCMAKE_C_COMPILER="${CC:-cc}" \
       -DCMAKE_EXE_LINKER_FLAGS="${CMAKE_EXE_LINKER_FLAGS:-}" \
-      -Ddetector_DIR="$DETECTOR_BUILD/install" \
-      -Dcheckpoint_DIR="$CHECKPOINT_BUILD/install" \
+      -Ddetector_DIR="$DETECTOR_INSTALL" \
+      -Dcheckpoint_DIR="$CHECKPOINT_INSTALL" \
       -DCMAKE_PREFIX_PATH="${CMAKE_PREFIX_PATH:-}" \
-      -DCMAKE_INSTALL_PREFIX="$VT_BUILD/install" \
+      -DCMAKE_INSTALL_PREFIX="$VT_INSTALL" \
       -Dvt_ci_build="${VT_CI_BUILD:-0}" \
       -Dvt_debug_verbose="${VT_DEBUG_VERBOSE:-}" \
       -Dvt_tests_num_nodes="${VT_TESTS_NUM_NODES:-}" \
@@ -239,10 +242,22 @@ fi
 is_alpine="$(grep ID < /etc/os-release | grep -c alpine || true)"
 if test "$is_alpine" -eq 0 && test "${VT_CI_BUILD:-0}" -eq 1 && test "${target}" = "install"
 then
+    if test "$VT_INCLUSION_TYPE" = "TPL"
+    then
+        echo "Clean up before building vt-sample-project"
+        cmake --build . --target clean
+        rm -rf "$VT_INSTALL"
+    fi
+
+    if test "$VT_INCLUSION_TYPE" = "EXT_LIB"
+    then
+        export vt_DIR="$VT_INSTALL"
+    fi
+
     git clone https://github.com/DARMA-tasking/vt-sample-project
     mkdir -p vt-sample-project/build
     cd vt-sample-project/build
-    export vt_DIR="$VT_BUILD/install"
+
     cmake -G "${CMAKE_GENERATOR:-Ninja}" \
       -Dvt_DIR="${VT}" \
       -Dcheckpoint_DIR="${CHECKPOINT}" \