diff options
75 files changed, 106 insertions, 95 deletions
diff --git a/Library/Formula/aften.rb b/Library/Formula/aften.rb index faa65aa4b..e2aef71ec 100644 --- a/Library/Formula/aften.rb +++ b/Library/Formula/aften.rb @@ -9,7 +9,7 @@ class Aften < Formula def install mkdir 'default' do - system "cmake #{std_cmake_parameters} -DSHARED=ON .." + system "cmake", "-DSHARED=ON", "..", *std_cmake_args system "make install" end end diff --git a/Library/Formula/apiextractor.rb b/Library/Formula/apiextractor.rb index ead6c4d65..6ac6b0a2c 100644 --- a/Library/Formula/apiextractor.rb +++ b/Library/Formula/apiextractor.rb @@ -9,7 +9,7 @@ class Apiextractor < Formula depends_on 'qt' def install - system "cmake #{std_cmake_parameters} ." + system "cmake", ".", *std_cmake_args system "make install" end end diff --git a/Library/Formula/armadillo.rb b/Library/Formula/armadillo.rb index dd01bb9b3..0ebc0a12d 100644 --- a/Library/Formula/armadillo.rb +++ b/Library/Formula/armadillo.rb @@ -9,7 +9,7 @@ class Armadillo < Formula depends_on 'boost' def install - system "cmake #{std_cmake_parameters} ." + system "cmake", ".", *std_cmake_args system "make install" end end diff --git a/Library/Formula/arss.rb b/Library/Formula/arss.rb index b4df31b82..fe5313f5b 100644 --- a/Library/Formula/arss.rb +++ b/Library/Formula/arss.rb @@ -10,7 +10,7 @@ class Arss < Formula def install cd "src" do - system "cmake #{std_cmake_parameters} ." + system "cmake", ".", *std_cmake_args system "make install" end end diff --git a/Library/Formula/assimp.rb b/Library/Formula/assimp.rb index dca759cd0..8cc030b00 100644 --- a/Library/Formula/assimp.rb +++ b/Library/Formula/assimp.rb @@ -9,7 +9,7 @@ class Assimp < Formula depends_on 'boost' def install - system "cmake #{std_cmake_parameters} ." + system "cmake", ".", *std_cmake_args system "make install" end diff --git a/Library/Formula/automoc4.rb b/Library/Formula/automoc4.rb index 9e19ee29a..87e710e71 100644 --- a/Library/Formula/automoc4.rb +++ b/Library/Formula/automoc4.rb @@ -16,7 +16,7 @@ class Automoc4 < Formula end def install - system "cmake #{std_cmake_parameters} ." + system "cmake", ".", *std_cmake_args system "make install" end end diff --git a/Library/Formula/avidemux.rb b/Library/Formula/avidemux.rb index a8f8e8e52..f3ae7166e 100644 --- a/Library/Formula/avidemux.rb +++ b/Library/Formula/avidemux.rb @@ -74,7 +74,7 @@ class Avidemux < Formula # Build the core. gettext = Formula.factory('gettext') mkdir 'corebuild' do - args = std_cmake_parameters.split + %W[ + args = std_cmake_args + %W[ -DCMAKE_PREFIX_PATH=#{gettext.prefix} -DMAC_BUNDLE_DIR=#{prefix} -DGTK=OFF @@ -116,7 +116,7 @@ class Avidemux < Formula end mkdir 'plugbuild' do - args = std_cmake_parameters.split + %W[ + args = std_cmake_args + %W[ -DGTK=OFF -DSDL=OFF -DESD=OFF diff --git a/Library/Formula/avro-c.rb b/Library/Formula/avro-c.rb index b668f63a7..7ba826056 100644 --- a/Library/Formula/avro-c.rb +++ b/Library/Formula/avro-c.rb @@ -8,7 +8,7 @@ class AvroC < Formula depends_on 'cmake' => :build def install - system "cmake #{std_cmake_parameters} ." + system "cmake", ".", *std_cmake_args system "make install" end end diff --git a/Library/Formula/box2d.rb b/Library/Formula/box2d.rb index 2a8fa45b9..31075560d 100644 --- a/Library/Formula/box2d.rb +++ b/Library/Formula/box2d.rb @@ -9,7 +9,10 @@ class Box2d < Formula def install cd 'Build' do - system "cmake -DBOX2D_INSTALL=ON -DBOX2D_BUILD_SHARED=ON #{std_cmake_parameters} .." + system "cmake", "..", + "-DBOX2D_INSTALL=ON", + "-DBOX2D_BUILD_SHARED=ON", + *std_cmake_args system "make install" end end diff --git a/Library/Formula/chromaprint.rb b/Library/Formula/chromaprint.rb index 18017a8ef..dfe06efe5 100644 --- a/Library/Formula/chromaprint.rb +++ b/Library/Formula/chromaprint.rb @@ -13,12 +13,9 @@ class Chromaprint < Formula depends_on 'ffmpeg' unless ARGV.include? '--without-examples' def install - if ARGV.include? '--without-examples' - args = std_cmake_parameters - else - args = std_cmake_parameters + ' -DBUILD_EXAMPLES=ON' - end - system "cmake #{args} ." + args = std_cmake_args + args << '-DBUILD_EXAMPLES=ON' unless ARGV.include? '--without-examples' + system "cmake", ".", *args system "make install" end end diff --git a/Library/Formula/clay.rb b/Library/Formula/clay.rb index dd6a99e23..a3d5f95eb 100644 --- a/Library/Formula/clay.rb +++ b/Library/Formula/clay.rb @@ -11,7 +11,7 @@ class Clay < Formula depends_on 'llvm' => :build def install - system "cmake #{std_cmake_parameters} ." + system "cmake", ".", *std_cmake_args system "make install" end diff --git a/Library/Formula/clhep.rb b/Library/Formula/clhep.rb index 941bdf361..6c15be8d3 100644 --- a/Library/Formula/clhep.rb +++ b/Library/Formula/clhep.rb @@ -9,7 +9,9 @@ class Clhep < Formula def install mkdir 'clhep-build' do - system "cmake #{std_cmake_parameters} -DCMAKE_PREFIX_PATH='#{prefix}' ../CLHEP" + system "cmake", "../CLHEP", + "-DCMAKE_PREFIX_PATH=#{prefix}", + *std_cmake_args system "make install" end end diff --git a/Library/Formula/clucene.rb b/Library/Formula/clucene.rb index c15f027e7..66265dee4 100644 --- a/Library/Formula/clucene.rb +++ b/Library/Formula/clucene.rb @@ -8,7 +8,7 @@ class Clucene < Formula def install if ARGV.build_head? - system "cmake #{std_cmake_parameters} ." + system "cmake", ".", *std_cmake_args else system "./configure", "--disable-debug", "--disable-dependency-tracking", "--prefix=#{prefix}" diff --git a/Library/Formula/cminpack.rb b/Library/Formula/cminpack.rb index c6df814e7..58fff6042 100644 --- a/Library/Formula/cminpack.rb +++ b/Library/Formula/cminpack.rb @@ -8,7 +8,7 @@ class Cminpack < Formula depends_on 'cmake' => :build def install - system "cmake #{std_cmake_parameters} ." + system "cmake", ".", *std_cmake_args system "make install" end end diff --git a/Library/Formula/collada-dom.rb b/Library/Formula/collada-dom.rb index 65c0c141f..837672929 100644 --- a/Library/Formula/collada-dom.rb +++ b/Library/Formula/collada-dom.rb @@ -15,7 +15,7 @@ class ColladaDom < Formula end def install - system "cmake #{std_cmake_parameters} ." + system "cmake", ".", *std_cmake_args system "make install" end end diff --git a/Library/Formula/dcmtk.rb b/Library/Formula/dcmtk.rb index e1b8a0aef..f4e0035a8 100644 --- a/Library/Formula/dcmtk.rb +++ b/Library/Formula/dcmtk.rb @@ -20,7 +20,7 @@ class Dcmtk < Formula ENV.m64 if MacOS.prefer_64_bit? ENV.x11 - args = std_cmake_parameters.split + args = std_cmake_args args << '-DDCMTK_WITH_DOXYGEN=YES' if ARGV.include? '--with-docs' mkdir 'build' do diff --git a/Library/Formula/eigen.rb b/Library/Formula/eigen.rb index 39278db95..d438884d9 100644 --- a/Library/Formula/eigen.rb +++ b/Library/Formula/eigen.rb @@ -10,7 +10,7 @@ class Eigen < Formula def install ENV.fortran mkdir 'eigen-build' do - system "cmake #{std_cmake_parameters} -DCMAKE_BUILD_TYPE=Release -Dpkg_config_libdir='#{lib}' .." + system "cmake", "..", "-Dpkg_config_libdir=#{lib}", *std_cmake_args system "make install" end end diff --git a/Library/Formula/fann.rb b/Library/Formula/fann.rb index e551083d0..82e706bd3 100644 --- a/Library/Formula/fann.rb +++ b/Library/Formula/fann.rb @@ -8,7 +8,7 @@ class Fann < Formula depends_on 'cmake' => :build def install - system "cmake . #{std_cmake_parameters}" + system "cmake", ".", *std_cmake_args system "make install" end end diff --git a/Library/Formula/flann.rb b/Library/Formula/flann.rb index 095bce8fd..64f9a83bd 100644 --- a/Library/Formula/flann.rb +++ b/Library/Formula/flann.rb @@ -21,7 +21,7 @@ class Flann < Formula depends_on 'numpy' => :python if ARGV.include? '--enable-python' def install - args = std_cmake_parameters.split + args = std_cmake_args if ARGV.include? '--enable-matlab' args << '-DBUILD_MATLAB_BINDINGS:BOOL=ON' else diff --git a/Library/Formula/fluid-synth.rb b/Library/Formula/fluid-synth.rb index f9595bbfb..edb85f131 100644 --- a/Library/Formula/fluid-synth.rb +++ b/Library/Formula/fluid-synth.rb @@ -17,7 +17,7 @@ class FluidSynth < Formula def install mkdir 'build' do - system "cmake #{std_cmake_parameters} -Denable-framework=OFF -DLIB_SUFFIX= .." + system "cmake", "..", "-Denable-framework=OFF", "-DLIB_SUFFIX=", *std_cmake_args system "make install" end end diff --git a/Library/Formula/freerdp.rb b/Library/Formula/freerdp.rb index 42d7330c7..0981f9b6f 100644 --- a/Library/Formula/freerdp.rb +++ b/Library/Formula/freerdp.rb @@ -17,7 +17,7 @@ class Freerdp < Formula end def install - system "cmake . #{std_cmake_parameters}" + system "cmake", ".", *std_cmake_args system "make install" end end diff --git a/Library/Formula/gccxml.rb b/Library/Formula/gccxml.rb index 9054a4072..816da6af0 100644 --- a/Library/Formula/gccxml.rb +++ b/Library/Formula/gccxml.rb @@ -9,7 +9,7 @@ class Gccxml < Formula def install mkdir 'gccxml-build' do - system "cmake #{std_cmake_parameters} .." + system "cmake", ".", *std_cmake_args system "make" system "make install" end diff --git a/Library/Formula/generatorrunner.rb b/Library/Formula/generatorrunner.rb index 0c0820b90..bd29c4027 100644 --- a/Library/Formula/generatorrunner.rb +++ b/Library/Formula/generatorrunner.rb @@ -10,11 +10,10 @@ class Generatorrunner < Formula depends_on 'apiextractor' def install - args = std_cmake_parameters.split - args << "-DCMAKE_INSTALL_NAME_DIR=#{HOMEBREW_PREFIX}/lib" - args << "-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON" - - system "cmake", ".", *args + system "cmake", ".", + "-DCMAKE_INSTALL_NAME_DIR=#{HOMEBREW_PREFIX}/lib", + "-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON", + *std_cmake_args system "make install" end end diff --git a/Library/Formula/io.rb b/Library/Formula/io.rb index a46b7ce25..913d3eb9d 100644 --- a/Library/Formula/io.rb +++ b/Library/Formula/io.rb @@ -15,7 +15,7 @@ class Io < Formula def install ENV.j1 mkdir 'buildroot' do - system "cmake #{std_cmake_parameters} .." + system "cmake", "..", *std_cmake_args system 'make' output = %x[./_build/binaries/io ../libs/iovm/tests/correctness/run.io] if $?.exitstatus != 0 diff --git a/Library/Formula/json_spirit.rb b/Library/Formula/json_spirit.rb index 55f6ec586..3ccf52a80 100644 --- a/Library/Formula/json_spirit.rb +++ b/Library/Formula/json_spirit.rb @@ -9,7 +9,7 @@ class JsonSpirit < Formula depends_on 'cmake' => :build def install - system "cmake #{std_cmake_parameters} ." + system "cmake", ".", *std_cmake_args system "make install" end end diff --git a/Library/Formula/lasi.rb b/Library/Formula/lasi.rb index 2594f153c..5eb81dea5 100644 --- a/Library/Formula/lasi.rb +++ b/Library/Formula/lasi.rb @@ -13,7 +13,7 @@ class Lasi < Formula depends_on 'doxygen' def install - system "cmake -DCMAKE_INSTALL_PREFIX='#{prefix}' ." + system "cmake", ".", *std_cmake_args system "make install" end end diff --git a/Library/Formula/lastfm_fplib.rb b/Library/Formula/lastfm_fplib.rb index 6d42cb341..4b3a92d87 100644 --- a/Library/Formula/lastfm_fplib.rb +++ b/Library/Formula/lastfm_fplib.rb @@ -11,7 +11,7 @@ class LastfmFplib < Formula depends_on 'fftw' def install - system "cmake #{std_cmake_parameters} ." + system "cmake", ".", *std_cmake_args system "make install" end end diff --git a/Library/Formula/lastfmfpclient.rb b/Library/Formula/lastfmfpclient.rb index e1ec5aba9..8707bc633 100644 --- a/Library/Formula/lastfmfpclient.rb +++ b/Library/Formula/lastfmfpclient.rb @@ -13,7 +13,7 @@ class Lastfmfpclient < Formula depends_on 'libsamplerate' def install - system "cmake #{std_cmake_parameters} ." + system "cmake", ".", *std_cmake_args system "make install" end end diff --git a/Library/Formula/libcuefile.rb b/Library/Formula/libcuefile.rb index 43ca280cc..4998ceff6 100644 --- a/Library/Formula/libcuefile.rb +++ b/Library/Formula/libcuefile.rb @@ -9,7 +9,7 @@ class Libcuefile < Formula depends_on 'cmake' => :build def install - system "cmake . #{std_cmake_parameters}" + system "cmake", ".", *std_cmake_args system "make install" include.install 'include/cuetools/' end diff --git a/Library/Formula/libdbusmenu-qt.rb b/Library/Formula/libdbusmenu-qt.rb index 06bc23a47..28a27acc5 100644 --- a/Library/Formula/libdbusmenu-qt.rb +++ b/Library/Formula/libdbusmenu-qt.rb @@ -9,7 +9,7 @@ class LibdbusmenuQt < Formula depends_on 'qt' def install - system "cmake #{std_cmake_parameters} ." + system "cmake", ".", *std_cmake_args system "make install" end end diff --git a/Library/Formula/libechonest.rb b/Library/Formula/libechonest.rb index 09e652899..01bd38f1e 100644 --- a/Library/Formula/libechonest.rb +++ b/Library/Formula/libechonest.rb @@ -10,7 +10,7 @@ class Libechonest < Formula depends_on 'qjson' def install - system "cmake #{std_cmake_parameters} ." + system "cmake", ".", *std_cmake_args system "make install" end end diff --git a/Library/Formula/libgit2.rb b/Library/Formula/libgit2.rb index af3909a8d..4d29fbdbf 100644 --- a/Library/Formula/libgit2.rb +++ b/Library/Formula/libgit2.rb @@ -11,7 +11,9 @@ class Libgit2 < Formula def install mkdir 'build' do - system "cmake #{std_cmake_parameters} -DBUILD_TESTS=NO .." + system "cmake", "..", + "-DBUILD_TESTS=NO", + *std_cmake_args system "make install" end end diff --git a/Library/Formula/liblas.rb b/Library/Formula/liblas.rb index 5aad9555d..077dfc1a9 100644 --- a/Library/Formula/liblas.rb +++ b/Library/Formula/liblas.rb @@ -21,7 +21,7 @@ class Liblas < Formula # http://liblas.org/compilation.html ENV['Boost_INCLUDE_DIR'] = "#{HOMEBREW_PREFIX}/include" ENV['Boost_LIBRARY_DIRS'] = "#{HOMEBREW_PREFIX}/lib" - system "cmake #{std_cmake_parameters} .." + system "cmake", "..", *std_cmake_args system "make" system "make test" if ARGV.include? '--with-test' system "make install" diff --git a/Library/Formula/libmusicbrainz.rb b/Library/Formula/libmusicbrainz.rb index cee7a6214..b837603e2 100644 --- a/Library/Formula/libmusicbrainz.rb +++ b/Library/Formula/libmusicbrainz.rb @@ -10,9 +10,9 @@ class Libmusicbrainz < Formula def install neon = Formula.factory("neon") - neon_args = "-DNEON_LIBRARIES:FILEPATH='#{neon.lib}/libneon.dylib' -DNEON_INCLUDE_DIR:PATH='#{neon.include}/neon'" - - system "cmake #{std_cmake_parameters} #{neon_args} ." + neon_args %W[-DNEON_LIBRARIES:FILEPATH=#{neon.lib}/libneon.dylib + -DNEON_INCLUDE_DIR:PATH=#{neon.include}/neon] + system "cmake", ".", *(std_cmake_args + neon_args) system "make install" end end diff --git a/Library/Formula/libplist.rb b/Library/Formula/libplist.rb index 0380bba8c..8517617d9 100644 --- a/Library/Formula/libplist.rb +++ b/Library/Formula/libplist.rb @@ -16,7 +16,7 @@ class Libplist < Formula def install ENV.deparallelize # make fails on an 8-core Mac Pro - system "cmake #{std_cmake_parameters} -DCMAKE_INSTALL_NAME_DIR='#{lib}' ." + system "cmake", ".", "-DCMAKE_INSTALL_NAME_DIR=#{lib}", *std_cmake_args system "make install" # Remove 'plutil', which duplicates the system-provided one. Leave the versioned one, though. diff --git a/Library/Formula/libreplaygain.rb b/Library/Formula/libreplaygain.rb index 50681da38..b7d591087 100644 --- a/Library/Formula/libreplaygain.rb +++ b/Library/Formula/libreplaygain.rb @@ -9,7 +9,7 @@ class Libreplaygain < Formula depends_on 'cmake' => :build def install - system "cmake . #{std_cmake_parameters}" + system "cmake", ".", *std_cmake_args system "make install" include.install 'include/replaygain/' end diff --git a/Library/Formula/libssh.rb b/Library/Formula/libssh.rb index ea5586662..6c67b3c7e 100644 --- a/Library/Formula/libssh.rb +++ b/Library/Formula/libssh.rb @@ -9,7 +9,7 @@ class Libssh < Formula def install mkdir 'build' do - system "cmake #{std_cmake_parameters} .." + system "cmake", "..", *std_cmake_args system "make install" end end diff --git a/Library/Formula/libwbxml.rb b/Library/Formula/libwbxml.rb index 0c82452bc..4cc466816 100644 --- a/Library/Formula/libwbxml.rb +++ b/Library/Formula/libwbxml.rb @@ -9,7 +9,7 @@ class Libwbxml < Formula def install mkdir "build" do - system "cmake #{std_cmake_parameters} .." + system "cmake", "..", *std_cmake_args system "make install" end end diff --git a/Library/Formula/mosquitto.rb b/Library/Formula/mosquitto.rb index 437a4530e..dee777e54 100644 --- a/Library/Formula/mosquitto.rb +++ b/Library/Formula/mosquitto.rb @@ -8,7 +8,7 @@ class Mosquitto < Formula depends_on 'cmake' => :build def install - system "cmake #{std_cmake_parameters} ." + system "cmake", ".", *std_cmake_args system "make install" end diff --git a/Library/Formula/musepack.rb b/Library/Formula/musepack.rb index 2e2434298..190cd8bdc 100644 --- a/Library/Formula/musepack.rb +++ b/Library/Formula/musepack.rb @@ -11,7 +11,7 @@ class Musepack < Formula depends_on 'libreplaygain' def install - system "cmake . #{std_cmake_parameters}" + system "cmake", ".", *std_cmake_args system "make install" lib.install 'libmpcdec/libmpcdec.dylib' end diff --git a/Library/Formula/mydumper.rb b/Library/Formula/mydumper.rb index da39fd3b0..215d3377c 100644 --- a/Library/Formula/mydumper.rb +++ b/Library/Formula/mydumper.rb @@ -35,7 +35,7 @@ class Mydumper < Formula depends_on 'pcre' def install - system "cmake #{std_cmake_parameters} ." + system "cmake", ".", *std_cmake_args system "make install" end diff --git a/Library/Formula/mysql-connector-c++.rb b/Library/Formula/mysql-connector-c++.rb index 748bd151d..03dad2dc3 100644 --- a/Library/Formula/mysql-connector-c++.rb +++ b/Library/Formula/mysql-connector-c++.rb @@ -9,7 +9,7 @@ class MysqlConnectorCxx < Formula depends_on 'boost' => :build def install - system "cmake #{std_cmake_parameters} ." + system "cmake", ".", *std_cmake_args ENV.j1 system "make install" end diff --git a/Library/Formula/mysql-connector-c.rb b/Library/Formula/mysql-connector-c.rb index 0408d4e7a..714778fdc 100644 --- a/Library/Formula/mysql-connector-c.rb +++ b/Library/Formula/mysql-connector-c.rb @@ -13,7 +13,7 @@ class MysqlConnectorC < Formula end def install - system "cmake #{std_cmake_parameters} ." + system "cmake", ".", *std_cmake_args system 'make' ENV.j1 system 'make install' diff --git a/Library/Formula/opencc.rb b/Library/Formula/opencc.rb index 9257202c2..f649efc65 100644 --- a/Library/Formula/opencc.rb +++ b/Library/Formula/opencc.rb @@ -8,7 +8,7 @@ class Opencc < Formula depends_on 'cmake' => :build def install - args = std_cmake_parameters.split + args = std_cmake_args args << '-DENABLE_GETTEXT:BOOL=OFF' system 'cmake', '.', *args system 'make' diff --git a/Library/Formula/opencolorio.rb b/Library/Formula/opencolorio.rb index 6b5f49f0d..ff0d368c1 100644 --- a/Library/Formula/opencolorio.rb +++ b/Library/Formula/opencolorio.rb @@ -21,7 +21,7 @@ class Opencolorio < Formula end def install - args = std_cmake_parameters.split + args = std_cmake_args args << "-DOCIO_BUILD_JNIGLUE=ON" if ARGV.include? '--with-java' args << "-DOCIO_BUILD_TESTS=ON" if ARGV.include? '--with-tests' args << "-DOCIO_BUILD_DOCS=ON" if ARGV.include? '--with-docs' diff --git a/Library/Formula/opencv.rb b/Library/Formula/opencv.rb index 888404a40..1d6926b47 100644 --- a/Library/Formula/opencv.rb +++ b/Library/Formula/opencv.rb @@ -45,7 +45,7 @@ class Opencv < Formula end def install - args = std_cmake_parameters.split + args = std_cmake_args args << "-DOPENCV_EXTRA_C_FLAGS='-arch i386 -m32'" if ARGV.build_32_bit? args << "-DWITH_QT=ON" if ARGV.include? "--with-qt" diff --git a/Library/Formula/openmeeg.rb b/Library/Formula/openmeeg.rb index d961e6be0..dda59c357 100644 --- a/Library/Formula/openmeeg.rb +++ b/Library/Formula/openmeeg.rb @@ -11,7 +11,7 @@ class Openmeeg < Formula depends_on 'hdf5' def install - system "cmake #{std_cmake_parameters} -DUSE_PROGRESSBAR=ON ." + system "cmake", ".", "-DUSE_PROGRESSBAR=ON", *std_cmake_args system "make install" end end diff --git a/Library/Formula/pdal.rb b/Library/Formula/pdal.rb index c57d0d751..ed008e3e7 100644 --- a/Library/Formula/pdal.rb +++ b/Library/Formula/pdal.rb @@ -9,7 +9,7 @@ class Pdal < Formula depends_on 'boost' def install - system "cmake #{std_cmake_parameters} ." + system "cmake", ".", *std_cmake_args system "make install" end end diff --git a/Library/Formula/perceptualdiff.rb b/Library/Formula/perceptualdiff.rb index 7c86a76c1..03880ae87 100644 --- a/Library/Formula/perceptualdiff.rb +++ b/Library/Formula/perceptualdiff.rb @@ -9,7 +9,7 @@ class Perceptualdiff < Formula depends_on 'freeimage' def install - system "cmake #{std_cmake_parameters} ." + system "cmake", ".", *std_cmake_args system "make install" end end diff --git a/Library/Formula/percona-server.rb b/Library/Formula/percona-server.rb index 45ac9903d..059117799 100644 --- a/Library/Formula/percona-server.rb +++ b/Library/Formula/percona-server.rb @@ -38,7 +38,7 @@ class PerconaServer < Formula # Make sure the var/msql directory exists (var+"percona").mkpath - args = std_cmake_parameters.split + [ + args = std_cmake_args + [ ".", "-DMYSQL_DATADIR=#{var}/percona", "-DINSTALL_MANDIR=#{man}", diff --git a/Library/Formula/physfs.rb b/Library/Formula/physfs.rb index 1c159b729..fb3039d8e 100644 --- a/Library/Formula/physfs.rb +++ b/Library/Formula/physfs.rb @@ -9,7 +9,10 @@ class Physfs < Formula def install mkdir 'macbuild' do - system "cmake #{std_cmake_parameters} -DPHYSFS_BUILD_WX_TEST=FALSE -DPHYSFS_BUILD_TEST=TRUE .." + system "cmake", "..", + "-DPHYSFS_BUILD_WX_TEST=FALSE", + "-DPHYSFS_BUILD_TEST=TRUE", + *std_cmake_args system "make" system "make install" end diff --git a/Library/Formula/podofo.rb b/Library/Formula/podofo.rb index 834c4365a..2bbf7fe39 100644 --- a/Library/Formula/podofo.rb +++ b/Library/Formula/podofo.rb @@ -17,7 +17,9 @@ class Podofo < Formula mkdir 'build' do # Build shared to simplify linking for other programs. - system "cmake #{std_cmake_parameters} -DPODOFO_BUILD_SHARED:BOOL=TRUE .." + system "cmake", "..", + "-DPODOFO_BUILD_SHARED:BOOL=TRUE", + *std_cmake_args system "make install" end end diff --git a/Library/Formula/points2grid.rb b/Library/Formula/points2grid.rb index 08239bda0..75e8a9579 100644 --- a/Library/Formula/points2grid.rb +++ b/Library/Formula/points2grid.rb @@ -10,7 +10,7 @@ class Points2grid < Formula depends_on 'pdal' def install - system "cmake #{std_cmake_parameters} ." + system "cmake", ".", *std_cmake_args system "make install" end end diff --git a/Library/Formula/pyside-tools.rb b/Library/Formula/pyside-tools.rb index d2f7b8f0d..991e30a59 100644 --- a/Library/Formula/pyside-tools.rb +++ b/Library/Formula/pyside-tools.rb @@ -18,7 +18,7 @@ class PysideTools < Formula depends_on 'pyside' def install - system "cmake #{std_cmake_parameters} -DSITE_PACKAGE=#{site_package_dir} ." + system "cmake", ".", "-DSITE_PACKAGE=#{site_package_dir}", *std_cmake_args system "make install" end end diff --git a/Library/Formula/pyside.rb b/Library/Formula/pyside.rb index 6c50570f1..ca3deeec5 100644 --- a/Library/Formula/pyside.rb +++ b/Library/Formula/pyside.rb @@ -24,7 +24,7 @@ class Pyside < Formula ENV.append_to_cflags "-F#{qt.prefix}/Frameworks" # Also need `ALTERNATIVE_QT_INCLUDE_DIR` to prevent "missing file" errors. - args = std_cmake_parameters.split + %W[ + args = std_cmake_args + %W[ -DALTERNATIVE_QT_INCLUDE_DIR=#{qt.prefix}/Frameworks -DSITE_PACKAGE=#{site_package_dir} -DBUILD_TESTS=NO diff --git a/Library/Formula/qhull.rb b/Library/Formula/qhull.rb index d56a459b7..49b033a5f 100644 --- a/Library/Formula/qhull.rb +++ b/Library/Formula/qhull.rb @@ -21,7 +21,7 @@ class Qhull < Formula end def install - system "cmake #{std_cmake_parameters} -DMAN_INSTALL_DIR='#{man1}' ." + system "cmake", ".", "-DMAN_INSTALL_DIR=#{man1}", *std_cmake_args system "make install" end end diff --git a/Library/Formula/qjson.rb b/Library/Formula/qjson.rb index 77b52d80d..632386b02 100644 --- a/Library/Formula/qjson.rb +++ b/Library/Formula/qjson.rb @@ -9,7 +9,7 @@ class Qjson < Formula depends_on 'qt' def install - system "cmake #{std_cmake_parameters} ." + system "cmake", ".", *std_cmake_args system "make install" end end diff --git a/Library/Formula/quassel.rb b/Library/Formula/quassel.rb index 1caca3b45..887faf4e7 100644 --- a/Library/Formula/quassel.rb +++ b/Library/Formula/quassel.rb @@ -15,7 +15,7 @@ class Quassel < Formula end def install - system "cmake #{std_cmake_parameters} ." + system "cmake", ".", *std_cmake_args system "make install" end end diff --git a/Library/Formula/scantailor.rb b/Library/Formula/scantailor.rb index c1bcb7e44..8cc61f266 100644 --- a/Library/Formula/scantailor.rb +++ b/Library/Formula/scantailor.rb @@ -23,7 +23,7 @@ class Scantailor < Formula end def install - system "cmake #{std_cmake_parameters} -DPNG_INCLUDE_DIR=/usr/X11/include ." + system "cmake", ".", "-DPNG_INCLUDE_DIR=/usr/X11/include", *std_cmake_args system "make install" end end diff --git a/Library/Formula/sedna.rb b/Library/Formula/sedna.rb index d51fc42a8..132a53ac5 100644 --- a/Library/Formula/sedna.rb +++ b/Library/Formula/sedna.rb @@ -9,8 +9,8 @@ class Sedna < Formula def install # Build needs to be created from outside the source directory. - mktemp do - system "cmake #{std_cmake_parameters} #{buildpath}" + mkdir 'build' do + system "cmake", "..", *std_cmake_args system "make install" end end diff --git a/Library/Formula/shark.rb b/Library/Formula/shark.rb index 3670775e8..88c3ad11f 100644 --- a/Library/Formula/shark.rb +++ b/Library/Formula/shark.rb @@ -8,7 +8,7 @@ class Shark < Formula depends_on 'cmake' => :build def install - system "cmake #{std_cmake_parameters} ." + system "cmake", ".", *std_cmake_args system "make install" end end diff --git a/Library/Formula/shiboken.rb b/Library/Formula/shiboken.rb index d23473522..5a3f0050d 100644 --- a/Library/Formula/shiboken.rb +++ b/Library/Formula/shiboken.rb @@ -11,7 +11,7 @@ class Shiboken < Formula def install # Building the tests also runs them. Not building and running tests cuts # install time in half. - system "cmake #{std_cmake_parameters} -DBUILD_TESTS=OFF ." + system "cmake", ".", "-DBUILD_TESTS=OFF", *std_cmake_args system "make install" end end diff --git a/Library/Formula/simgrid.rb b/Library/Formula/simgrid.rb index e133bf7c0..5bef19fe0 100644 --- a/Library/Formula/simgrid.rb +++ b/Library/Formula/simgrid.rb @@ -14,7 +14,10 @@ class Simgrid < Formula end def install - system "cmake -Denable_debug=on -Denable_compile_optimizations=off #{std_cmake_parameters} ." + system "cmake", ".", + "-Denable_debug=on", + "-Denable_compile_optimizations=off", + *std_cmake_args system "make install" end end diff --git a/Library/Formula/taglib.rb b/Library/Formula/taglib.rb index a6dc8fade..8534ff5af 100644 --- a/Library/Formula/taglib.rb +++ b/Library/Formula/taglib.rb @@ -9,7 +9,7 @@ class Taglib < Formula def install ENV.append 'CXXFLAGS', "-DNDEBUG=1" - system "cmake #{std_cmake_parameters} -DWITH_MP4=ON -DWITH_ASF=ON" + system "cmake", "-DWITH_MP4=ON", "-DWITH_ASF=ON", *std_cmake_args system "make" system "make install" end diff --git a/Library/Formula/task.rb b/Library/Formula/task.rb index e5ebfd3b1..0a01b9069 100644 --- a/Library/Formula/task.rb +++ b/Library/Formula/task.rb @@ -10,7 +10,7 @@ class Task < Formula skip_clean :all def install - system "cmake #{std_cmake_parameters}" + system "cmake", ".", *std_cmake_args system "make install" (etc+'bash_completion.d').install 'scripts/bash/task_completion.sh' (share+'zsh/site-functions').install 'scripts/zsh/_task' diff --git a/Library/Formula/teem.rb b/Library/Formula/teem.rb index 92e40febd..9c3dec93f 100644 --- a/Library/Formula/teem.rb +++ b/Library/Formula/teem.rb @@ -24,7 +24,7 @@ class Teem < Formula end def install - cmake_args = std_cmake_parameters.split + cmake_args = std_cmake_args cmake_args << "-DBUILD_SHARED_LIBS:BOOL=ON" if ARGV.include? '--experimental-apps' diff --git a/Library/Formula/uchardet.rb b/Library/Formula/uchardet.rb index 409ff0951..b9e5493a0 100644 --- a/Library/Formula/uchardet.rb +++ b/Library/Formula/uchardet.rb @@ -8,7 +8,7 @@ class Uchardet < Formula depends_on 'cmake' => :build def install - args = std_cmake_parameters.split + args = std_cmake_args args << "-DCMAKE_INSTALL_NAME_DIR=#{lib}" system "cmake", '.', *args system "make install" diff --git a/Library/Formula/usbmuxd.rb b/Library/Formula/usbmuxd.rb index 7bec60622..c0736361c 100644 --- a/Library/Formula/usbmuxd.rb +++ b/Library/Formula/usbmuxd.rb @@ -19,14 +19,11 @@ class Usbmuxd < Formula # The CMake scripts responsible for locating libusb headers are broken. So, # we explicitly point the build script at the proper directory. - args = std_cmake_parameters.split.concat %W[ - -DLIB_SUFFIX='' - -DUSB_INCLUDE_DIR='#{libusb.include.children.first}' - ] - - mkdir 'build' - chdir 'build' do - system 'cmake', '..', *args + mkdir 'build' do + system "cmake", "..", + "-DLIB_SUFFIX=", + "-DUSB_INCLUDE_DIR=#{libusb.include.children.first}", + *std_cmake_args system 'make install' end end diff --git a/Library/Formula/vrpn.rb b/Library/Formula/vrpn.rb index c19ff90ea..764e11122 100644 --- a/Library/Formula/vrpn.rb +++ b/Library/Formula/vrpn.rb @@ -19,7 +19,7 @@ class Vrpn < Formula end def install - args = std_cmake_parameters.split + args = std_cmake_args if ARGV.include? '--clients' args << "-DVRPN_BUILD_CLIENTS:BOOL=ON" diff --git a/Library/Formula/vtk.rb b/Library/Formula/vtk.rb index 5147ba7f9..ae6e06338 100644 --- a/Library/Formula/vtk.rb +++ b/Library/Formula/vtk.rb @@ -19,7 +19,7 @@ class Vtk < Formula end def install - args = std_cmake_parameters.split + [ + args = std_cmake_args + [ "-DVTK_REQUIRED_OBJCXX_FLAGS:STRING=''", "-DVTK_USE_CARBON:BOOL=OFF", "-DBUILD_TESTING:BOOL=OFF", diff --git a/Library/Formula/wv2.rb b/Library/Formula/wv2.rb index e900cc33b..90a2269fc 100644 --- a/Library/Formula/wv2.rb +++ b/Library/Formula/wv2.rb @@ -11,7 +11,7 @@ class Wv2 < Formula def install ENV.append 'LDFLAGS', '-liconv -lgobject-2.0' # work around broken detection - system "cmake #{std_cmake_parameters} ." + system "cmake", ".", *std_cmake_args system "make install" end end diff --git a/Library/Formula/xrootd.rb b/Library/Formula/xrootd.rb index 434a745a6..54fb4a009 100644 --- a/Library/Formula/xrootd.rb +++ b/Library/Formula/xrootd.rb @@ -9,7 +9,7 @@ class Xrootd < Formula def install mkdir "build" do - system "cmake", "..", *std_cmake_parameters + system "cmake", "..", *std_cmake_args system "make install" end end diff --git a/Library/Formula/yaml-cpp.rb b/Library/Formula/yaml-cpp.rb index 5280dc74f..06175d381 100644 --- a/Library/Formula/yaml-cpp.rb +++ b/Library/Formula/yaml-cpp.rb @@ -9,7 +9,7 @@ class YamlCpp < Formula depends_on 'libyaml' def install - system "cmake #{std_cmake_parameters} ." + system "cmake", ".", *std_cmake_args system "make install" end end diff --git a/Library/Formula/yarp.rb b/Library/Formula/yarp.rb index bb79f0fe1..25a11a8ac 100644 --- a/Library/Formula/yarp.rb +++ b/Library/Formula/yarp.rb @@ -16,7 +16,7 @@ class Yarp < Formula depends_on 'jpeg' def install - args = std_cmake_parameters.split + %W[ + args = std_cmake_args + %W[ -DCREATE_LIB_MATH=TRUE -DCREATE_GUIS=TRUE -DCREATE_YMANAGER=TRUE diff --git a/Library/Formula/zint.rb b/Library/Formula/zint.rb index 6a1dc9193..cb4eda785 100644 --- a/Library/Formula/zint.rb +++ b/Library/Formula/zint.rb @@ -11,7 +11,10 @@ class Zint < Formula def install mkdir 'zint-build' do - system "cmake #{std_cmake_parameters} -DCMAKE_PREFIX_PATH='#{prefix}' -DCMAKE_C_FLAGS=-I/usr/X11/include .." + system "cmake", "..", + "-DCMAKE_PREFIX_PATH=#{prefix}", + "-DCMAKE_C_FLAGS=-I/usr/X11/include", + *std_cmake_args system "make install" end end |