Skip to content
Snippets Groups Projects
Commit 4e8d3959 authored by Brad Barber's avatar Brad Barber
Browse files

- 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.
parent 74d76d22
No related branches found
No related tags found
No related merge requests found
# 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
...@@ -54,7 +54,7 @@ width="100" height="100"></a> Qhull Downloads</h1> ...@@ -54,7 +54,7 @@ width="100" height="100"></a> Qhull Downloads</h1>
<p>Debian, rpm, and Autoconf distributions will appear later</p> <p>Debian, rpm, and Autoconf distributions will appear later</p>
</li> </li>
<li><a href="http://gitorious.org/qhull">Gitorious Qhull</a> (git://gitorious.org/qhull/qhull.git) <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, <p>Includes documentation, source files, C++ interface,
and test programs. The C++ interface may change without notice. 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 If using gcc 4.1, 4.2, or 4.3, please compile qset.c with
......
...@@ -373,6 +373,12 @@ is printed one per line. Each line is the number of neighbors ...@@ -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 followed by an index for each neighbor. The indices match the
other facet output formats.</p> 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 <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>, only good facets ('<A href="qh-optp.htm#Pg">Pg</a>', <A href="qdelaun.htm" >qdelaunay</a>,
<A href="qvoronoi.htm" >qvoronoi</a>). It <A href="qvoronoi.htm" >qvoronoi</a>). It
...@@ -620,7 +626,13 @@ each facet</a></h3> ...@@ -620,7 +626,13 @@ each facet</a></h3>
printed, one per line. Each line is the number of vertices printed, one per line. Each line is the number of vertices
followed by the corresponding point ids. Vertices are listed in followed by the corresponding point ids. Vertices are listed in
the order they were added to the hull (the last one added is the 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">&#187;</a><a name="Fv2">Fv - print Voronoi <h3><A href="#format">&#187;</a><a name="Fv2">Fv - print Voronoi
diagram</a></h3> diagram</a></h3>
......
...@@ -58,7 +58,8 @@ and higher. </p> ...@@ -58,7 +58,8 @@ and higher. </p>
<li><a <li><a
href="http://www.geom.uiuc.edu/graphics/pix/Special_Topics/Computational_Geometry/welcome.html">Examples href="http://www.geom.uiuc.edu/graphics/pix/Special_Topics/Computational_Geometry/welcome.html">Examples
</a>of Qhull output </li> </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=""> <li><input name=as_q size=10 value="">
<input type="submit" value="Search"> <input type="submit" value="Search">
www.qhull.org www.qhull.org
......
...@@ -26,19 +26,27 @@ file(GLOB qhull_hdr *.h) ...@@ -26,19 +26,27 @@ file(GLOB qhull_hdr *.h)
add_library(qhull SHARED ${qhull_src}) add_library(qhull SHARED ${qhull_src})
target_link_libraries(qhull m) target_link_libraries(qhull m)
if(UNIX) if(UNIX)
if(APPLE) if(APPLE)
set_target_properties(qhull PROPERTIES set(qhullcmd_SOURCES unix.c) set_target_properties(qhull PROPERTIES
INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib")set(rbox_SOURCES rbox.c) INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib")
else(APPLE)set(qconvex_SOURCES qconvex.c) else(APPLE)
set_target_properties(qhull PROPERTIES set(qdelaunay_SOURCES qdelaun.c) set_target_properties(qhull PROPERTIES
INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib"set(qvoronoi_SOURCES qvoronoi.c) INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib"
INSTALL_RPATH_USE_LINK_PATH TRUEset(qhalf_SOURCES qhalf.c) INSTALL_RPATH_USE_LINK_PATH TRUE
BUILD_WITH_INSTALL_RPATH FALSE) BUILD_WITH_INSTALL_RPATH FALSE)
endif(APPLE) endif(APPLE)
endif(UNIX) endif(UNIX)
add_library(qhullstatic STATIC ${qhull_src}) add_library(qhullstatic STATIC ${qhull_src})
set_property(TARGET qhullstatic PROPERTY OUTPUT_NAME "qhull") 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}) add_executable(qhullcmd ${qhullcmd_SOURCES})
target_link_libraries(qhullcmd qhull) target_link_libraries(qhullcmd qhull)
set_property(TARGET qhullcmd PROPERTY OUTPUT_NAME "qhull") set_property(TARGET qhullcmd PROPERTY OUTPUT_NAME "qhull")
...@@ -59,7 +67,7 @@ add_executable(qhalf ${qhalf_SOURCES}) ...@@ -59,7 +67,7 @@ add_executable(qhalf ${qhalf_SOURCES})
target_link_libraries(qhalf qhull) target_link_libraries(qhalf qhull)
install(TARGETS qhull qhullstatic qhullcmd rbox qconvex qdelaunay qvoronoi qhalf install(TARGETS qhull qhullstatic qhullcmd rbox qconvex qdelaunay qvoronoi qhalf
RUNTIME DESTINATION bin RUNTIME DESTINATION bin
LIBRARY DESTINATION lib LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib) ARCHIVE DESTINATION lib)
install(FILES libqhull.h DESTINATION include) install(FILES libqhull.h DESTINATION include)
...@@ -17,6 +17,17 @@ Need help ...@@ -17,6 +17,17 @@ Need help
To do To do
- Review email for doc changes - Review email for doc changes
- RMP build of Qhull - 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 gitorious.org/qhull 2010/01/23
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment