Removed Qt4 requirement + added link to download and tutorial to the front page of the documentation dev
authorDmitriy Morozov <dmitriy@mrzv.org>
Mon, 31 Aug 2009 10:51:56 -0700
branchdev
changeset 167 5a5f3e1c466b
parent 166 1f3d54b2315b
child 168 3b0665eb35bc
Removed Qt4 requirement + added link to download and tutorial to the front page of the documentation
doc/get-build-install.rst
doc/index.rst
doc/tutorial.rst
tools/CMakeLists.txt
--- a/doc/get-build-install.rst	Fri Aug 21 14:26:56 2009 -0700
+++ b/doc/get-build-install.rst	Mon Aug 31 10:51:56 2009 -0700
@@ -1,3 +1,5 @@
+.. _download:
+
 Get, Build, Install
 ===================
 
--- a/doc/index.rst	Fri Aug 21 14:26:56 2009 -0700
+++ b/doc/index.rst	Mon Aug 31 10:51:56 2009 -0700
@@ -17,7 +17,7 @@
 
 * Persistent homology computation [ELZ02]_ [ZC05]_
 * Vineyards [CEM06]_    |cpp-only|
-* Persistent cohomology computation (described in [dSVJ09]_)    |cpp-only|
+* Persistent cohomology computation (described in [dSVJ09]_)
 * Zigzag persistent homology [CdSM09]_
 * :ref:`examples` provide useful functionality in and of themselves:
   
@@ -39,6 +39,8 @@
 simplicity, elegance, and interactivity of Python. Since they mimick the C++
 functionality, their documentation may be a helpful resource for the latter.
 
+:ref:`Download <download>` the software, or read a :ref:`tutorial` to
+get acquainted with its structure.
 
 .. include::    substitutions.aux
 
--- a/doc/tutorial.rst	Fri Aug 21 14:26:56 2009 -0700
+++ b/doc/tutorial.rst	Mon Aug 31 10:51:56 2009 -0700
@@ -33,7 +33,7 @@
 smallest value of the squared distance function on the dual Voronoi cell) and
 whether the simplex is attached or not (i.e. whether its dual cell does not or
 does contain a critical point of the distance function). See :ref:`alphashapes`
-for more details.
+for more details, and :ref:`alpha-shape-example` for a full example.
 
 As a result, if one wanted only those simplices whose alpha shape value did not
 exceed 10, one could obtain them as follows::
--- a/tools/CMakeLists.txt	Fri Aug 21 14:26:56 2009 -0700
+++ b/tools/CMakeLists.txt	Mon Aug 31 10:51:56 2009 -0700
@@ -1,15 +1,19 @@
-find_package                (Qt4 REQUIRED)
-set                         (QT_USE_QTOPENGL TRUE)
-set                         (QT_USE_QTXML TRUE)
-include                     (${QT_USE_FILE})
+find_package                (Qt4)
 
+if                          (QT4_FOUND)
+    set                     (QT_USE_QTOPENGL TRUE)
+    set                     (QT_USE_QTXML TRUE)
+    include                 (${QT_USE_FILE})
+
+    add_subdirectory        (diagram-viewer)
 #find_library                (gle_LIBRARY                NAMES gle)
 #find_library                (QGLViewer_LIBRARY          NAMES QGLViewer)
 #find_path                   (QGLViewer_INCLUDE_DIR      QGLViewer/qglviewer.h)
 #include_directories         (${QGLViewer_INCLUDE_DIR})
+endif                       (QT4_FOUND)
+
 
 add_executable              (extract-diagram                extract-diagram.cpp)
 target_link_libraries       (extract-diagram                ${libraries} ${Boost_SERIALIZATION_LIBRARY})
 
-add_subdirectory            (diagram-viewer)
 add_subdirectory            (matching)