Skip to content

Commit

Permalink
Remove ROOT workaround required for old cmake
Browse files Browse the repository at this point in the history
  • Loading branch information
davidrohr committed Mar 28, 2020
1 parent acf5358 commit c7e6165
Showing 1 changed file with 0 additions and 7 deletions.
7 changes: 0 additions & 7 deletions root.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,6 @@ incremental_recipe: |
"$INSTALLROOT/etc/plugins/TSystem/P030_TAlienSystem.C" \
"$INSTALLROOT/etc/plugins/TFile/P070_TAlienFile.C"

# Reduce ROOT C++ Standard Interface Requirement to C++14 for CUDA compatibility
sed -i.deleteme -e "s/cxx_std_17/cxx_std_14/" "$INSTALLROOT/cmake/ROOTConfig-targets.cmake" || true
find . -name '*.deleteme' -exec rm -f '{}' \; || true

mkdir -p $INSTALLROOT/etc/modulefiles && rsync -a --delete etc/modulefiles/ $INSTALLROOT/etc/modulefiles
---
#!/bin/bash -e
Expand Down Expand Up @@ -199,9 +195,6 @@ fi

# Make some CMake files used by other projects relocatable
sed -i.deleteme -e "s!$BUILDDIR!$INSTALLROOT!g" $(find "$INSTALLROOT" -name '*.cmake') || true
# Reduce ROOT C++ Standard Interface Requirement to C++14 for CUDA compatibility
sed -i.deleteme -e "s/cxx_std_17/cxx_std_14/" "$INSTALLROOT/cmake/ROOTConfig-targets.cmake" || true
find . -name '*.deleteme' -exec rm -f '{}' \; || true

rm -vf "$INSTALLROOT/etc/plugins/TGrid/P010_TAlien.C" \
"$INSTALLROOT/etc/plugins/TSystem/P030_TAlienSystem.C" \
Expand Down

0 comments on commit c7e6165

Please sign in to comment.