diff options
| author | Fredrik Wallner | 2013-06-26 11:02:51 +0200 |
|---|---|---|
| committer | Adam Vandenberg | 2013-06-26 15:26:46 -0700 |
| commit | d7ac21b068109d355eb88c2cbb37aaa2d11abb57 (patch) | |
| tree | 4a76b8af12674372c383d6616949a789f5efff3c /Library/Formula | |
| parent | 0ce99a54f9f8a2e9820da1b9fd33cf6390f5b626 (diff) | |
| download | homebrew-d7ac21b068109d355eb88c2cbb37aaa2d11abb57.tar.bz2 | |
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 <flangy@gmail.com>
Diffstat (limited to 'Library/Formula')
| -rw-r--r-- | Library/Formula/open-babel.rb | 11 |
1 files changed, 9 insertions, 2 deletions
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" |