From d7ac21b068109d355eb88c2cbb37aaa2d11abb57 Mon Sep 17 00:00:00 2001 From: Fredrik Wallner Date: Wed, 26 Jun 2013 11:02:51 +0200 Subject: open-babel: 2.3.2 patch to fix pybel's Molecule.draw + fix for Cairo Added a patch that fixes Molecule.draw() in pybel.py (similar to upstream commit df59c4a630cf753723d1318c40479d48b7507e1c) Also fixed the inclusion of the Cairo library and includes. Earlier the CMake directives were poiting to locations within the open-babel installation. There also seemed to be a confusion between strings and arguments, giving cmake problems to understand the directive. Closes #20800. Signed-off-by: Adam Vandenberg --- Library/Formula/open-babel.rb | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'Library/Formula') diff --git a/Library/Formula/open-babel.rb b/Library/Formula/open-babel.rb index 6b87e1252..532806c66 100644 --- a/Library/Formula/open-babel.rb +++ b/Library/Formula/open-babel.rb @@ -15,12 +15,19 @@ class OpenBabel < Formula depends_on 'cairo' => :optional depends_on 'eigen' if build.with?('python') || build.with?('java') + # Patch to fix Molecule.draw() in pybel in accordance with upstream commit df59c4a630cf753723d1318c40479d48b7507e1c + def patches + "https://gist.github.com/fredrikw/5858168/raw" + end + def install args = %W[ -DCMAKE_INSTALL_PREFIX=#{prefix} ] args << "-DJAVA_BINDINGS=ON" if build.with? 'java' args << "-DBUILD_GUI=ON" if build.with? 'wxmac' - args << "-DCAIRO_INCLUDE_DIRS=#{include}/cairo "\ - "-DCAIRO_LIBRARIES=#{lib}/libcairo.dylib" if build.with? 'cairo' + # Looking for Cairo in HOMEBREW_PREFIX + # setting the arguments separately, joining them in one string fails with the 'system "cmake", *args' command + args << "-DCAIRO_INCLUDE_DIRS='#{HOMEBREW_PREFIX}/include/cairo'" if build.with? 'cairo' + args << "-DCAIRO_LIBRARIES='#{HOMEBREW_PREFIX}/lib/libcairo.dylib'" if build.with? 'cairo' python do args << "-DPYTHON_BINDINGS=ON" -- cgit v1.2.3