Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (d99b672b0cc56a6e187909c5afd8819034a40987)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (d99b672b0cc56a6e187909c5afd8819034a40987)
  • Date: Thu, 26 May 2011 11:07:57 -0500

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

science/qhull/DETAILS | 4 +--
science/qhull/HISTORY | 4 +++
science/qhull/PRE_BUILD | 3 --
science/qhull/cmake.diff | 51
-----------------------------------------------
4 files changed, 6 insertions(+), 56 deletions(-)

New commits:
commit d99b672b0cc56a6e187909c5afd8819034a40987
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

qhull: => 2011.1

diff --git a/science/qhull/DETAILS b/science/qhull/DETAILS
index 6518096..81a1d96 100755
--- a/science/qhull/DETAILS
+++ b/science/qhull/DETAILS
@@ -1,6 +1,6 @@
SPELL=qhull
- VERSION=2010.1
-
SOURCE_HASH=sha512:aa87a6041f63e05418cefd73109c459909ef5860184496a881a46dc840de9b0182d65a88960ac3bfd1e770e9c64ee554916d02bf30d8039c82b8f8f6a889cc64
+ VERSION=2011.1
+
SOURCE_HASH=sha512:b08161af2551a0d6b63c9c48925ff5e0d0de7da69c28599d58e9f8c40638666b1a453d208b74d3b6ad6821e1be09d1d2154dbfd8e8982d15bb66d1a97f89b154
SOURCE=$SPELL-$VERSION-src.tgz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.qhull.org/download/$SOURCE
diff --git a/science/qhull/HISTORY b/science/qhull/HISTORY
index 2e4c3a3..9ffd894 100644
--- a/science/qhull/HISTORY
+++ b/science/qhull/HISTORY
@@ -1,3 +1,7 @@
+2011-05-26 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2011.1
+ * PRE_BUILD,cmake.diff: deleted
+
2010-07-14 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2010.1
* DEPENDS: add cmake, remove enscript
diff --git a/science/qhull/PRE_BUILD b/science/qhull/PRE_BUILD
deleted file mode 100755
index 1225451..0000000
--- a/science/qhull/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p1 < $SPELL_DIRECTORY/cmake.diff
diff --git a/science/qhull/cmake.diff b/science/qhull/cmake.diff
deleted file mode 100644
index 1cb745c..0000000
--- a/science/qhull/cmake.diff
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -uNr qhull-2010.1/CMakeLists.txt qhull-2010.1.cp//CMakeLists.txt
---- qhull-2010.1/CMakeLists.txt 2010-01-10 01:07:32.000000000 +0100
-+++ qhull-2010.1.cp//CMakeLists.txt 2010-07-15 08:42:34.000000000 +0200
-@@ -6,3 +6,4 @@
-
- add_subdirectory(src)
-
-+install(DIRECTORY html DESTINATION share/doc/qhull)
-diff -uNr qhull-2010.1/src/CMakeLists.txt qhull-2010.1.cp//src/CMakeLists.txt
---- qhull-2010.1/src/CMakeLists.txt 2010-01-10 01:07:32.000000000 +0100
-+++ qhull-2010.1.cp//src/CMakeLists.txt 2010-07-15 08:42:46.000000000
+0200
-@@ -23,8 +23,21 @@
-
- file(GLOB qhull_hdr *.h)
-
--add_library(qhull ${qhull_src})
-+add_library(qhull SHARED ${qhull_src})
- target_link_libraries(qhull m)
-+if(UNIX)
-+ if(APPLE)
-+ set_target_properties(qhull PROPERTIES
-+ INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib")
-+ else(APPLE)
-+ set_target_properties(qhull PROPERTIES
-+ INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib"
-+ INSTALL_RPATH_USE_LINK_PATH TRUE
-+ BUILD_WITH_INSTALL_RPATH FALSE)
-+ endif(APPLE)
-+endif(UNIX)
-+add_library(qhullstatic STATIC ${qhull_src})
-+set_property(TARGET qhullstatic PROPERTY OUTPUT_NAME "qhull")
-
- set(qhullcmd_SOURCES unix.c)
- set(rbox_SOURCES rbox.c)
-@@ -36,6 +49,7 @@
-
- add_executable(qhullcmd ${qhullcmd_SOURCES})
- target_link_libraries(qhullcmd qhull)
-+set_property(TARGET qhullcmd PROPERTY OUTPUT_NAME "qhull")
-
- add_executable(rbox ${rbox_SOURCES})
- target_link_libraries(rbox qhull)
-@@ -52,3 +66,8 @@
- add_executable(qhalf ${qhalf_SOURCES})
- target_link_libraries(qhalf qhull)
-
-+install(TARGETS qhull qhullstatic qhullcmd rbox qconvex qdelaunay qvoronoi
qhalf
-+ RUNTIME DESTINATION bin
-+ LIBRARY DESTINATION lib
-+ ARCHIVE DESTINATION lib)
-+install(FILES libqhull.h DESTINATION include)



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (d99b672b0cc56a6e187909c5afd8819034a40987), Treeve Jelbert, 05/26/2011

Archive powered by MHonArc 2.6.24.

Top of Page