Skip to content

Instantly share code, notes, and snippets.

@ejtttje
Created July 13, 2015 18:56
Show Gist options
  • Select an option

  • Save ejtttje/40b1fbb562bedd52dd10 to your computer and use it in GitHub Desktop.

Select an option

Save ejtttje/40b1fbb562bedd52dd10 to your computer and use it in GitHub Desktop.
class Qhull < Formula
homepage "http://www.qhull.org/"
url "http://www.qhull.org/download/qhull-2012.1-src.tgz"
mirror "http://lil.fr.distfiles.macports.org/qhull/qhull-2012.1-src.tgz"
sha1 "60f61580e1d6fbbd28e6df2ff625c98d15b5fbc6"
bottle do
root_url "https://downloads.sf.net/project/machomebrew/Bottles/science"
cellar :any
sha1 "67b8992742d9c2bd0a07d731aa6ed7a55ac361f9" => :yosemite
sha1 "9ea434329af6194b30a0fee4cf2833fdb208929a" => :mavericks
sha1 "ff1e819f3427676f55b21a9da9e3378229b72a62" => :mountain_lion
end
depends_on "cmake" => :build
# Patch originally from MacPorts - cosmetic edits to CMakeLists.txt:
#
# * The VERSION property is no longer set on the command line tools.
# Setting this property causes CMake to install `binname-version` along
# with a symlink `binname` that points to `binname-version`. This is
# pointless for something that is managed by a package manager.
# https://trac.macports.org/export/83287/trunk/dports/math/qhull/files/patch-CMakeLists.txt.diff'}
patch :DATA
def install
system "cmake", ".", *std_cmake_args
system "make", "install"
end
end
__END__
diff -ur qhull-2012.1/CMakeLists.txt qhull-2012.1.patched/CMakeLists.txt
--- qhull-2012.1/CMakeLists.txt 2012-02-21 19:38:47.000000000 -0800
+++ qhull-2012.1.patched/CMakeLists.txt 2015-07-13 11:46:13.000000000 -0700
@@ -312,13 +312,10 @@
# ---------------------------------------
add_library(${qhull_STATIC} STATIC ${libqhull_SOURCES})
-set_target_properties(${qhull_STATIC} PROPERTIES
- VERSION ${qhull_VERSION})
add_library(${qhull_STATICP} STATIC ${libqhull_SOURCES})
set_target_properties(${qhull_STATICP} PROPERTIES
- COMPILE_DEFINITIONS "qh_QHpointer"
- VERSION ${qhull_VERSION})
+ COMPILE_DEFINITIONS "qh_QHpointer")
if(UNIX)
target_link_libraries(${qhull_STATIC} m)
@@ -331,8 +328,7 @@
add_library(${qhull_CPP} STATIC ${libqhullcpp_SOURCES})
set_target_properties(${qhull_CPP} PROPERTIES
- COMPILE_DEFINITIONS "qh_QHpointer"
- VERSION ${qhull_VERSION})
+ COMPILE_DEFINITIONS "qh_QHpointer")
# ---------------------------------------
# Define qhull executables linked to qhullstatic library
diff -ur qhull-2012.1/src/libqhullcpp/QhullIterator.h qhull-2012.1.patched/src/libqhullcpp/QhullIterator.h
--- qhull-2012.1/src/libqhullcpp/QhullIterator.h 2012-01-25 19:32:05.000000000 -0800
+++ qhull-2012.1.patched/src/libqhullcpp/QhullIterator.h 2015-07-13 11:47:39.000000000 -0700
@@ -16,8 +16,7 @@
#include <assert.h>
#include <string>
#include <vector>
-//! Avoid dependence on <iterator>
-namespace std { struct bidirectional_iterator_tag; struct random_access_iterator_tag; }
+#include <iterator>
namespace orgQhull {
diff -ur qhull-2012.1/src/libqhullcpp/QhullLinkedList.h qhull-2012.1.patched/src/libqhullcpp/QhullLinkedList.h
--- qhull-2012.1/src/libqhullcpp/QhullLinkedList.h 2012-01-25 19:32:05.000000000 -0800
+++ qhull-2012.1.patched/src/libqhullcpp/QhullLinkedList.h 2015-07-13 11:48:11.000000000 -0700
@@ -9,7 +9,7 @@
#ifndef QHULLLINKEDLIST_H
#define QHULLLINKEDLIST_H
-namespace std { struct bidirectional_iterator_tag; struct random_access_iterator_tag; }
+#include <iterator>
#include "QhullError.h"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment