aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorJack Nagel2012-05-22 16:32:12 -0500
committerJack Nagel2012-05-22 16:32:12 -0500
commita13857b15057586d1cfc268708c8112e2999a39b (patch)
treee6d42152cd1a5c5e8efe35d7af794a6be716a7f0 /Library
parent4dfa2806b9ee1b4272cf577d0aebb23a7b8d159f (diff)
downloadbrew-a13857b15057586d1cfc268708c8112e2999a39b.tar.bz2
Introduce std_cmake_args method
This differs from the current std_cmake_parameters in that it returns an array instead of a string. Doing so makes dealing with it in formulae much more pleasant, and for new formula hackers, less surprising. std_cmake_parameters is retained in compat to maintain compatibility with external formulae. Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Diffstat (limited to 'Library')
-rw-r--r--Library/Homebrew/compat/compatibility.rb4
-rw-r--r--Library/Homebrew/formula.rb4
2 files changed, 6 insertions, 2 deletions
diff --git a/Library/Homebrew/compat/compatibility.rb b/Library/Homebrew/compat/compatibility.rb
index 90fa4b633..1dcb52cb4 100644
--- a/Library/Homebrew/compat/compatibility.rb
+++ b/Library/Homebrew/compat/compatibility.rb
@@ -87,6 +87,10 @@ class Formula
@cc_failures ||= CompilerFailures.new
@cc_failures << fails_with_llvm_reason
end
+
+ def std_cmake_parameters
+ "-DCMAKE_INSTALL_PREFIX='#{prefix}' -DCMAKE_BUILD_TYPE=None -Wno-dev"
+ end
end
class UnidentifiedFormula < Formula
diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb
index af12bc185..04e6e2df1 100644
--- a/Library/Homebrew/formula.rb
+++ b/Library/Homebrew/formula.rb
@@ -239,8 +239,8 @@ class Formula
# Setting it to Release would ignore our flags.
# Note: there isn't a std_autotools variant because autotools is a lot
# less consistent and the standard parameters are more memorable.
- def std_cmake_parameters
- "-DCMAKE_INSTALL_PREFIX='#{prefix}' -DCMAKE_BUILD_TYPE=None -Wno-dev"
+ def std_cmake_args
+ %W[-DCMAKE_INSTALL_PREFIX=#{prefix} -DCMAKE_BUILD_TYPE=None -Wno-dev]
end
def self.class_s name