Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit f267da4

Browse files
committedFeb 10, 2024·
mcfm: 10.3
1 parent 0fc4ad1 commit f267da4

File tree

1 file changed

+10
-27
lines changed

1 file changed

+10
-27
lines changed
 

‎Formula/mcfm.rb

+10-27
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
class Mcfm < Formula
22
desc "Monte Carlo for FeMtobarn processes"
33
homepage "https://mcfm.fnal.gov"
4-
url "https://mcfm.fnal.gov/downloads/MCFM-10.2.2.tar.gz"
5-
sha256 "15ebd4cb51cafb4af674a2e0a3ec8c02ac88a49565b3265c80719c59c0cc3c9d"
4+
url "https://mcfm.fnal.gov/downloads/MCFM-10.3.tar.gz"
5+
sha256 "97677cbccb06b2821a5fa1569d1f561b253bd0651a97ab05d13247c708864840"
66
license "GPL-3.0-or-later"
77

88
livecheck do
@@ -19,22 +19,21 @@ class Mcfm < Formula
1919
option "with-nnlo-vv", "Build NNLO diboson processes (slow compilation)"
2020

2121
depends_on "cmake" => :build
22-
depends_on "gcc@12"
22+
depends_on "gcc" => :build
2323
depends_on "lhapdf" => :optional # needs to be built with gcc
2424

2525
fails_with :clang
2626

27-
patch :DATA
28-
2927
def install
30-
gcc = Formula["gcc@12"]
31-
ENV["FC"] = gcc.opt_bin/"gfortran-#{gcc.version_suffix}"
32-
gfortran_lib = gcc.opt_lib/"gcc/#{gcc.version_suffix}"
28+
gcc = Formula["gcc"]
29+
gcc_major_ver = gcc.any_installed_version.major
30+
ENV["FC"] = gcc.opt_bin/"gfortran-#{gcc_major_ver}"
31+
gfortran_lib = gcc.opt_lib/"gcc/#{gcc_major_ver}"
3332

34-
inreplace "lib/qcdloop-2.0.5/CMakeLists.txt",
33+
inreplace "lib/qcdloop-2.0.9/CMakeLists.txt",
3534
"target_link_libraries(qcdloop_shared)",
3635
"target_link_libraries(qcdloop_shared -L#{gfortran_lib} -lquadmath)"
37-
inreplace "lib/qcdloop-2.0.5/CMakeLists.txt",
36+
inreplace "lib/qcdloop-2.0.9/CMakeLists.txt",
3837
"target_link_libraries(qcdloop_static)",
3938
"target_link_libraries(qcdloop_static -L#{gfortran_lib} -lquadmath)"
4039

@@ -71,22 +70,6 @@ def caveats
7170

7271
inreplace "input.ini", "part = nlo", "part = lo" # avoid test timeout
7372
system bin/"mcfm", "input.ini"
74-
assert_predicate testpath/"W_only_lo_CT14nnlo_1.00_1.00_14TeV_total_cross.txt", :exist?
73+
assert_predicate testpath/"W_only_lo_LUXqed17_plus_PDF4LHC15_nnlo_30_100__100__test1_total_cross.txt", :exist?
7574
end
7675
end
77-
78-
__END__
79-
diff --git a/CMakeLists.txt b/CMakeLists.txt
80-
index 4fff350..1dc0b76 100644
81-
--- a/CMakeLists.txt
82-
+++ b/CMakeLists.txt
83-
@@ -290,8 +290,8 @@ if(use_internal_lhapdf)
84-
elseif(use_external_lhapdf)
85-
find_library(lhapdf_lib NAMES LHAPDF REQUIRED)
86-
target_link_libraries(mcfm ${lhapdf_lib})
87-
- if (${lhapdf_include_path})
88-
- target_include_directories(objlib PRIVATE "${LHAPDF_INCLUDE_PATH}" "${CMAKE_BINARY_DIR}/local/include" "${CMAKE_BINARY_DIR}/local/include/qd")
89-
+ if (NOT ${lhapdf_include_path} STREQUAL "OFF")
90-
+ target_include_directories(objlib PRIVATE "${lhapdf_include_path}" "${CMAKE_BINARY_DIR}/local/include" "${CMAKE_BINARY_DIR}/local/include/qd")
91-
endif()
92-
endif()

0 commit comments

Comments
 (0)
Please sign in to comment.