Skip to content
Merged
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 CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ Until May 2022 (inclusive) no changelog was kept. We might try to reconstruct it

### Changed

* CMake: Update to v4.2.3
* python: Require at least 3.12.12 in prefer_system_check
* ROOT: Update to 6.36.08
* defaults-actstracking: Removed all overrides unrelated to ACTS or C++20.
Expand Down
30 changes: 15 additions & 15 deletions cmake.sh
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package: CMake
version: "%(tag_basename)s"
tag: "v3.26.5"
tag: "v4.2.3"
source: https://github.com/Kitware/CMake
build_requires:
- "GCC-Toolchain:(?!osx)"
- "GCC-Toolchain:(?!osx)"
prefer_system: .*
prefer_system_check: |
REQUESTED_VERSION=${REQUESTED_VERSION#v}
Expand All @@ -12,27 +12,27 @@ prefer_system_check: |
---
#!/bin/bash -e

cat > build-flags.cmake <<- EOF
# Disable Java capabilities; we don't need it and on OS X might miss the
# required /System/Library/Frameworks/JavaVM.framework/Headers/jni.h.
SET(JNI_H FALSE CACHE BOOL "" FORCE)
SET(Java_JAVA_EXECUTABLE FALSE CACHE BOOL "" FORCE)
SET(Java_JAVAC_EXECUTABLE FALSE CACHE BOOL "" FORCE)
cat >build-flags.cmake <<-EOF
# Disable Java capabilities; we don't need it and on OS X might miss the
# required /System/Library/Frameworks/JavaVM.framework/Headers/jni.h.
SET(JNI_H FALSE CACHE BOOL "" FORCE)
SET(Java_JAVA_EXECUTABLE FALSE CACHE BOOL "" FORCE)
SET(Java_JAVAC_EXECUTABLE FALSE CACHE BOOL "" FORCE)

# SL6 with GCC 4.6.1 and LTO requires -ltinfo with -lcurses for link to succeed,
# but cmake is not smart enough to find it. We do not really need ccmake anyway,
# so just disable it.
SET(BUILD_CursesDialog FALSE CACHE BOOL "" FORCE)
# SL6 with GCC 4.6.1 and LTO requires -ltinfo with -lcurses for link to succeed,
# but cmake is not smart enough to find it. We do not really need ccmake anyway,
# so just disable it.
SET(BUILD_CursesDialog FALSE CACHE BOOL "" FORCE)
EOF

$SOURCEDIR/bootstrap --prefix=$INSTALLROOT \
--init=build-flags.cmake \
${JOBS:+--parallel=$JOBS}
--init=build-flags.cmake \
${JOBS:+--parallel=$JOBS}
make ${JOBS+-j $JOBS}
make install/strip

mkdir -p etc/modulefiles
cat > etc/modulefiles/$PKGNAME <<EoF
cat >etc/modulefiles/$PKGNAME <<EoF
#%Module1.0
proc ModulesHelp { } {
global version
Expand Down
1 change: 1 addition & 0 deletions hepmc.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ cmake $SOURCEDIR \
-Dmomentum=GEV \
-Dlength=MM \
-Dbuild_docs:BOOL=OFF \
-DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
-DCMAKE_INSTALL_PREFIX=$INSTALLROOT

make ${JOBS+-j $JOBS}
Expand Down
1 change: 1 addition & 0 deletions pythia6.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ build_requires:
cmake ${SOURCEDIR} \
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \
-DCMAKE_INSTALL_PREFIX=${INSTALLROOT} \
-DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
-DCMAKE_INSTALL_LIBDIR=lib
make ${JOBS+-j$JOBS}
make install
Expand Down
1 change: 1 addition & 0 deletions tbb.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ prepend_path:
cmake "$SOURCEDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLROOT" \
${CXXSTD:+-DCMAKE_CXX_STANDARD=$CXXSTD} \
-DCMAKE_INSTALL_LIBDIR=lib \
-DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
-DTBB_TEST=OFF

# Build and install
Expand Down
1 change: 1 addition & 0 deletions yaml-cpp.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ cmake $SOURCEDIR \
${BOOST_ROOT:+-DBoost_INCLUDE_DIR:PATH="$BOOST_ROOT/include"} \
-DCMAKE_SKIP_RPATH=YES \
-DYAML_CPP_BUILD_TESTS=NO \
-DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
-DSKIP_INSTALL_FILES=1

make ${JOBS+-j $JOBS} install
Expand Down