From 4e8d39599056d97dbf68e26ac2dd840b6eb748ec Mon Sep 17 00:00:00 2001
From: Brad Barber <bradb@shore.net>
Date: Mon, 25 Jan 2010 22:04:21 -0500
Subject: [PATCH] - Fixed src/CMakeLists.txt [M. Moll] - qh-optf.htm: Add note
about order of 'Fn' matching 'Fv' order [Q. Pan] - Add .gitignore with
ignored files and directories. - Use .git/info/exclude for locally excluded
files.
---
.gitignore | 52 ++++++++++++++++++++++++++++++++++++++++++++++
html/qh-get.htm | 2 +-
html/qh-optf.htm | 14 ++++++++++++-
index.htm | 3 ++-
src/CMakeLists.txt | 32 +++++++++++++++++-----------
src/Changes.txt | 11 ++++++++++
6 files changed, 99 insertions(+), 15 deletions(-)
create mode 100644 .gitignore
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..bd7f446
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,52 @@
+# git-ls-files --others --ignored
+# Lines that start with '#' are comments.
+
+# Backup and data files
+eg/eg.*
+*~
+*.bak
+*.off
+*.x
+x.*
+r
+x
+x?
+r?
+
+# patch results
+*.rej
+
+# Build products
+tmp/*
+project/Makefile*
+project/*/Makefile*
+project/*/object_script*
+project/*/Release/*
+project/*/Debug/*
+project/*/release/*
+project/*/debug/*
+*.a
+*.dll
+*.lib
+*.exe
+*.o
+*.md5sum
+
+# Qt files
+*.pro.user
+
+# DevStudio files
+*.bsc
+*.ncb
+*.pdb
+*.suo
+*.user
+*.ilk
+
+# CVS files
+CVS/*
+*/CVS/*
+*/*/CVS/*
+*/*/*/CVS/*
+*.cvsignore
+
diff --git a/html/qh-get.htm b/html/qh-get.htm
index 538919e..fc1bd08 100644
--- a/html/qh-get.htm
+++ b/html/qh-get.htm
@@ -54,7 +54,7 @@ width="100" height="100"></a> Qhull Downloads</h1>
<p>Debian, rpm, and Autoconf distributions will appear later</p>
</li>
<li><a href="http://gitorious.org/qhull">Gitorious Qhull</a> (git://gitorious.org/qhull/qhull.git)
- <p>Type: git repository for Qhull</b>
+ <p>Type: git repository for Qhull with <a href="http://www.qhull.org/src/Changes.txt">Changes.txt</a></p>
<p>Includes documentation, source files, C++ interface,
and test programs. The C++ interface may change without notice.
If using gcc 4.1, 4.2, or 4.3, please compile qset.c with
diff --git a/html/qh-optf.htm b/html/qh-optf.htm
index 7d293ea..60e5492 100644
--- a/html/qh-optf.htm
+++ b/html/qh-optf.htm
@@ -373,6 +373,12 @@ is printed one per line. Each line is the number of neighbors
followed by an index for each neighbor. The indices match the
other facet output formats.</p>
+<p>For simplicial facets, each neighbor is opposite
+the corresponding vertex (option '<A href="#Fv">Fv</a>').
+Do not compare to option '<A href="qh_opto.htm#i">i</a>'. Option 'i'
+orients facets by reversing the order of two vertices. For non-simplicial facets,
+the neighbors are unordered.
+
<p>A negative index indicates an unprinted facet due to printing
only good facets ('<A href="qh-optp.htm#Pg">Pg</a>', <A href="qdelaun.htm" >qdelaunay</a>,
<A href="qvoronoi.htm" >qvoronoi</a>). It
@@ -620,7 +626,13 @@ each facet</a></h3>
printed, one per line. Each line is the number of vertices
followed by the corresponding point ids. Vertices are listed in
the order they were added to the hull (the last one added is the
-first listed). Similar to option '<A href="qh-opto.htm#i">i</a>'.</p>
+first listed).
+</p>
+<p>Option '<A href="qh-opto.htm#i">i</a>' also lists the vertices,
+but it orients facets by reversing the order of two
+vertices. Option 'i' triangulates non-simplicial, 4-d and higher facets by
+adding vertices for the centrums.
+</p>
<h3><A href="#format">»</a><a name="Fv2">Fv - print Voronoi
diagram</a></h3>
diff --git a/index.htm b/index.htm
index 7c1f7f0..2219a3f 100644
--- a/index.htm
+++ b/index.htm
@@ -58,7 +58,8 @@ and higher. </p>
<li><a
href="http://www.geom.uiuc.edu/graphics/pix/Special_Topics/Computational_Geometry/welcome.html">Examples
</a>of Qhull output </li>
- <li><a href=http://gitorious.org/qhull/>Gitorious</a> C++ interface to Qhull (<a href="http://gitorious.org/qhull/pages/Home">wiki</a>)
+ <li><a href=http://gitorious.org/qhull/>Gitorious</a> C++ interface to Qhull
+ (<a href="http://gitorious.org/qhull/pages/Home">wiki</a>, <a href="http://www.qhull.org/src/Changes.txt">changes</a>)
<li><input name=as_q size=10 value="">
<input type="submit" value="Search">
www.qhull.org
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index debc104..45e246e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -26,19 +26,27 @@ file(GLOB qhull_hdr *.h)
add_library(qhull SHARED ${qhull_src})
target_link_libraries(qhull m)
if(UNIX)
- if(APPLE)
- set_target_properties(qhull PROPERTIES set(qhullcmd_SOURCES unix.c)
- INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib")set(rbox_SOURCES rbox.c)
- else(APPLE)set(qconvex_SOURCES qconvex.c)
- set_target_properties(qhull PROPERTIES set(qdelaunay_SOURCES qdelaun.c)
- INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib"set(qvoronoi_SOURCES qvoronoi.c)
- INSTALL_RPATH_USE_LINK_PATH TRUEset(qhalf_SOURCES qhalf.c)
- BUILD_WITH_INSTALL_RPATH FALSE)
- endif(APPLE)
+ 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)
+set(qconvex_SOURCES qconvex.c)
+set(qdelaunay_SOURCES qdelaun.c)
+set(qvoronoi_SOURCES qvoronoi.c)
+set(qhalf_SOURCES qhalf.c)
+
+
add_executable(qhullcmd ${qhullcmd_SOURCES})
target_link_libraries(qhullcmd qhull)
set_property(TARGET qhullcmd PROPERTY OUTPUT_NAME "qhull")
@@ -59,7 +67,7 @@ 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)
+ RUNTIME DESTINATION bin
+ LIBRARY DESTINATION lib
+ ARCHIVE DESTINATION lib)
install(FILES libqhull.h DESTINATION include)
diff --git a/src/Changes.txt b/src/Changes.txt
index 6932492..52039bb 100644
--- a/src/Changes.txt
+++ b/src/Changes.txt
@@ -17,6 +17,17 @@ Need help
To do
- Review email for doc changes
- RMP build of Qhull
+ - Create signed tags for Qhull versions
+ - Add FIXUP for known problems and update wiki
+ - Notes to compgeom on conformant triangulation and Voronoi volume
+
+
+------------
+gitorious.org/qhull 2010/01/25
+- qh-optf.htm: Add note about order of 'Fn' matching 'Fv' order [Q. Pan]
+- Fixed src/CMakeLists.txt [M. Moll]
+- Add .gitignore with ignored files and directories.
+- Use .git/info/exclude for locally excluded files.
------------
gitorious.org/qhull 2010/01/23
--
GitLab