Prefer "-DCMAKE..." over environment variables

3 files changed, 16 insertions, 7 deletions

diff --git a/Library/Formula/libbtbb.rb b/Library/Formula/libbtbb.rb
index a3ec01827..8a1745481 100644
--- a/Library/Formula/libbtbb.rb
+++ b/Library/Formula/libbtbb.rb
@@ -14,13 +14,15 @@ class Libbtbb < Formula
   depends_on "python"
 
   def install
+    args = std_cmake_args
+
     if build.universal?
       ENV.universal_binary
-      ENV["CMAKE_OSX_ARCHITECTURES"] = Hardware::CPU.universal_archs.as_cmake_arch_flags
+      args << "-DCMAKE_OSX_ARCHITECTURES=#{Hardware::CPU.universal_archs.as_cmake_arch_flags}"
     end
 
     mkdir "build" do
-      system "cmake", "..", *std_cmake_args
+      system "cmake", "..", *args
       system "make", "install"
     end
   end
diff --git a/Library/Formula/libfreenect.rb b/Library/Formula/libfreenect.rb
index 976aa909a..54142642b 100644
--- a/Library/Formula/libfreenect.rb
+++ b/Library/Formula/libfreenect.rb
@@ -13,12 +13,15 @@ class Libfreenect < Formula
   depends_on 'libusb'
 
   def install
+    args = std_cmake_args
+
     if build.universal?
       ENV.universal_binary
-      ENV['CMAKE_OSX_ARCHITECTURES'] = Hardware::CPU.universal_archs.as_cmake_arch_flags
+      args << "-DCMAKE_OSX_ARCHITECTURES=#{Hardware::CPU.universal_archs.as_cmake_arch_flags}"
     end
+
     mkdir "build" do
-      system "cmake", "..", *std_cmake_args
+      system "cmake", "..", *args
       system "make install"
     end
   end
diff --git a/Library/Formula/librtlsdr.rb b/Library/Formula/librtlsdr.rb
index 975406030..6b78adac8 100644
--- a/Library/Formula/librtlsdr.rb
+++ b/Library/Formula/librtlsdr.rb
@@ -13,12 +13,16 @@ class Librtlsdr < Formula
   depends_on "libusb"
 
   def install
+    args = std_cmake_args
+
     if build.universal?
       ENV.universal_binary
-      ENV["CMAKE_OSX_ARCHITECTURES"] = Hardware::CPU.universal_archs.as_cmake_arch_flags
+      args << "-DCMAKE_OSX_ARCHITECTURES=#{Hardware::CPU.universal_archs.as_cmake_arch_flags}"
     end
 
-    system "cmake", ".", *std_cmake_args
-    system "make", "install"
+    mkdir "build" do
+      system "cmake", "..", *args
+      system "make install"
+    end
   end
 end