admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #11841 from carlocab/cmake-args-params

Browse Source 
formula: allow `std_cmake_args` to take parameters
This commit is contained in:
Carlo Cabrera 2021-08-11 14:02:18 +08:00 committed by GitHub
commit 66dfcd44bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Library/Homebrew/formula.rb
View File

@ -1480,7 +1480,7 @@ class Formula
end end
# Standard parameters for cargo builds. # Standard parameters for cargo builds.
sig { params(root: String, path: String).returns(T::Array[T.any(String, Pathname)]) } sig { params(root: T.any(String, Pathname), path: String).returns(T::Array[T.any(String, Pathname)]) }
def std_cargo_args(root: prefix, path: ".") def std_cargo_args(root: prefix, path: ".")
["--locked", "--root", root, "--path", path] ["--locked", "--root", root, "--path", path]
end end
@ -1490,13 +1490,19 @@ class Formula
# Setting `CMAKE_FIND_FRAMEWORK` to "LAST" tells CMake to search for our # Setting `CMAKE_FIND_FRAMEWORK` to "LAST" tells CMake to search for our
# libraries before trying to utilize Frameworks, many of which will be from # libraries before trying to utilize Frameworks, many of which will be from
# 3rd party installs. # 3rd party installs.
sig { returns(T::Array[String]) } sig {
def std_cmake_args params(
install_prefix: T.any(String, Pathname),
install_libdir: String,
find_framework: String,
).returns(T::Array[String])
}
def std_cmake_args(install_prefix: prefix, install_libdir: "lib", find_framework: "LAST")
args = %W[ args = %W[
-DCMAKE_INSTALL_PREFIX=#{prefix} -DCMAKE_INSTALL_PREFIX=#{install_prefix}
-DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_INSTALL_LIBDIR=#{install_libdir}
-DCMAKE_BUILD_TYPE=Release -DCMAKE_BUILD_TYPE=Release
-DCMAKE_FIND_FRAMEWORK=LAST -DCMAKE_FIND_FRAMEWORK=#{find_framework}
-DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_VERBOSE_MAKEFILE=ON
-Wno-dev -Wno-dev
-DBUILD_TESTING=OFF -DBUILD_TESTING=OFF