Skip to content

Allow using CMake4 from the system #5842

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions aligeno2.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ requires:
- pythia
- ThePEG
- Rivet
- SHERPA
- lhapdf-pdfsets
- JETSCAPE
- CRMC
Expand Down
7 changes: 5 additions & 2 deletions cmake.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package: CMake
version: "%(tag_basename)s"
tag: "v3.31.6"
tag: "v4.0.0"
source: https://github.com/Kitware/CMake
requires:
- "OpenSSL:(?!osx)"
Expand All @@ -16,11 +16,14 @@
verle() { [[ "$1" = "$(echo -e "$1\n$2" | sort -V -r | head -n1)" ]]; }
current_version=$(cmake --version | sed -e 's/.* //' | cut -d. -f1,2,3)
echo alibuild_system_replace: cmake"$current_version"
type cmake && verge 3.28.1 $current_version && verle 3.99.99 $current_version
type cmake && verge 3.28.1 $current_version

Check notice on line 19 in cmake.sh

View workflow job for this annotation

GitHub Actions / alidistlint

Double quote to prevent globbing and word splitting. [SC2086]
env:
CMAKE_POLICY_VERSION_MINIMUM: 3.5

Check failure on line 21 in cmake.sh

View workflow job for this annotation

GitHub Actions / alidistlint

env.CMAKE_POLICY_VERSION_MINIMUM: must be of string type [ali:schema]
prefer_system_replacement_specs:
"cmake.*":
env:
CMAKE_VERSION: ""
CMAKE_POLICY_VERSION_MINIMUM: 3.5

Check failure on line 26 in cmake.sh

View workflow job for this annotation

GitHub Actions / alidistlint

prefer_system_replacement_specs.cmake.*.env.CMAKE_POLICY_VERSION_MINIMUM: must be of string type [ali:schema]
---
#!/bin/bash -e
SONAME=so
Expand Down
5 changes: 3 additions & 2 deletions mpfr.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@
- alibuild-recipe-tools
---
#!/bin/sh
rsync -a --delete --exclude '**/.git' $SOURCEDIR/ ./
perl -p -i -e 's/ doc / /' Makefile.am
rsync -a --chmod=ug=rwX --delete --exclude .git --delete-excluded $SOURCEDIR/ .

Check notice on line 11 in mpfr.sh

View workflow job for this annotation

GitHub Actions / alidistlint

Double quote to prevent globbing and word splitting. [SC2086]
sed -i.bak -e 's/ doc / /' Makefile.am
rm *.bak

Check notice on line 13 in mpfr.sh

View workflow job for this annotation

GitHub Actions / alidistlint

Use ./*glob* or -- *glob* so names with dashes won't become options. [SC2035]
autoreconf -ivf

./configure --prefix=$INSTALLROOT \
Expand Down
2 changes: 1 addition & 1 deletion openloops.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ build_requires:
- alibuild-recipe-tools
---
#!/bin/bash -e
rsync -a --delete --exclude '**/.git' --delete-excluded "$SOURCEDIR/" .
rsync -a --chmod=ug=rwX --delete --exclude .git --delete-excluded "$SOURCEDIR/" .

unset HTTP_PROXY # unset this to build on slc6 system

Expand Down
7 changes: 5 additions & 2 deletions sherpa.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
- lhapdf-pdfsets
- fastjet
- pythia
- sqlite
build_requires:
- "autotools:(slc6|slc7)"
- cgal
Expand All @@ -23,12 +24,14 @@
# When using the official repo the .git files are needed as Git_Info.C
# is generated and used during the build process, which fails in case
# we would not include the .git directory
rsync -a $SOURCEDIR/ ./
rsync -a --chmod=ug=rwX --exclude .git --delete-excluded $SOURCEDIR/ ./

Check notice on line 27 in sherpa.sh

View workflow job for this annotation

GitHub Actions / alidistlint

Double quote to prevent globbing and word splitting. [SC2086]

# Exclude building Manual from Makefile.am
sed -i.bak /Manual/d Makefile.am
rm -f Makefile.am.bak

[[ "X$SQLITE_ROOT" = X ]] && SQLITE_ROOT=$(brew --prefix sqlite)

autoreconf -ivf

# SHERPA's configure uses wget which might not be there
Expand All @@ -40,7 +43,7 @@

export LDFLAGS="$LDFLAGS -L$CGAL_ROOT/lib -L$GMP_ROOT/lib"
./configure --prefix=$INSTALLROOT \
--with-sqlite3=install \
--with-sqlite3=$SQLITE_ROOT \

Check notice on line 46 in sherpa.sh

View workflow job for this annotation

GitHub Actions / alidistlint

Double quote to prevent globbing and word splitting. [SC2086]
--enable-hepmc2=$HEPMC_ROOT \
--enable-hepmc3=$HEPMC3_ROOT \
--enable-lhapdf=$LHAPDF_ROOT \
Expand Down
Loading