Skip to content
Snippets Groups Projects

Draft: Resolve "DETECTOR_PATH should point to CMAKE_INSTALL_PREFIX subtree, not source dir"

2 files
+ 5
6
Compare changes
  • Side-by-side
  • Inline
Files
2
+ 4
5
@@ -24,7 +24,7 @@ fi
@@ -24,7 +24,7 @@ fi
## =============================================================================
## =============================================================================
## Step 1: download/update the detector definitions (if needed)
## Step 1: download/update the detector definitions (if needed)
pushd ${DETECTOR_PREFIX}
pushd ${LOCAL_PREFIX}/src
## We need an up-to-date copy of the detector
## We need an up-to-date copy of the detector
## start clean to avoid issues...
## start clean to avoid issues...
@@ -74,14 +74,15 @@ git clone --depth 1 https://eicweb.phy.anl.gov/EIC/detectors/accelerator.git
@@ -74,14 +74,15 @@ git clone --depth 1 https://eicweb.phy.anl.gov/EIC/detectors/accelerator.git
[[ "$?" == "0" ]] || exit 1
[[ "$?" == "0" ]] || exit 1
rm -rf "accelerator/.git"
rm -rf "accelerator/.git"
## Now symlink the accelerator definition into the detector definition
## Now symlink the accelerator and beamline definitions into the detector definition
echo "Linking accelerator definition into detector definition"
echo "Linking accelerator and beamline definition into detector definition"
ln -s -f ${DETECTOR_PREFIX}/accelerator/eic ${DETECTOR_PATH}/eic
ln -s -f ${DETECTOR_PREFIX}/accelerator/eic ${DETECTOR_PATH}/eic
[[ "$?" == "0" ]] || exit 1
[[ "$?" == "0" ]] || exit 1
ln -s -f ${DETECTOR_PREFIX}/${BEAMLINE_CONFIG}/${BEAMLINE_CONFIG} ${DETECTOR_PATH}/${BEAMLINE_CONFIG}
ln -s -f ${DETECTOR_PREFIX}/${BEAMLINE_CONFIG}/${BEAMLINE_CONFIG} ${DETECTOR_PATH}/${BEAMLINE_CONFIG}
[[ "$?" == "0" ]] || exit 1
[[ "$?" == "0" ]] || exit 1
popd
popd
 
## =============================================================================
## =============================================================================
## Step 2: Compile and install the detector definition
## Step 2: Compile and install the detector definition
echo "Building and installing the ${JUGGLER_DETECTOR} package"
echo "Building and installing the ${JUGGLER_DETECTOR} package"
@@ -98,8 +99,6 @@ cmake ${DETECTOR_PREFIX}/${BEAMLINE_CONFIG} -DCMAKE_INSTALL_PREFIX=${LOCAL_PREFI
@@ -98,8 +99,6 @@ cmake ${DETECTOR_PREFIX}/${BEAMLINE_CONFIG} -DCMAKE_INSTALL_PREFIX=${LOCAL_PREFI
popd
popd
rm -rf ${DETECTOR_PREFIX}/${BEAMLINE_CONFIG}_build
rm -rf ${DETECTOR_PREFIX}/${BEAMLINE_CONFIG}_build
## =============================================================================
## =============================================================================
## Step 3: That's all!
## Step 3: That's all!
echo "Detector build/install complete!"
echo "Detector build/install complete!"
Loading