Prefer "-DCMAKE..." over environment variables

Homebrew · May 10, 2014 · 1a74f66 · 1a74f66
1 parent 038e150
commit 1a74f66
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/Formula/libbtbb.rb b/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/Formula/libfreenect.rb b/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/Formula/librtlsdr.rb b/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