diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2015-04-29 14:36:57 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2015-04-29 14:36:57 -0700 |
| commit | 465d4e06ba7fa3a84a37a9fe5c0763e5fbd3895f (patch) | |
| tree | c7ce75264ccd5543996d3c5c24ce9cf095c0de69 /docs/doxygen/other | |
| parent | 1425e4828ab61d0579d39e8e6b6f362cba1017d8 (diff) | |
| parent | 9b9608e185755c298fcbd7fc05107740e387c330 (diff) | |
Merge branch 'maint'
Diffstat (limited to 'docs/doxygen/other')
| -rw-r--r-- | docs/doxygen/other/build_guide.dox | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/docs/doxygen/other/build_guide.dox b/docs/doxygen/other/build_guide.dox index ebf47dc7e2..8fc3f911fb 100644 --- a/docs/doxygen/other/build_guide.dox +++ b/docs/doxygen/other/build_guide.dox @@ -1,4 +1,4 @@ -/*! \page build_guide Build Instructions and Information + /*! \page build_guide Build Instructions and Information \section dependencies Dependencies @@ -24,11 +24,11 @@ installation tool (apt-get, pkg_install, YaST, yum, urpmi, etc.) first. Most recent systems have these packages available. \subsection dep_global Global Dependencies -\li git http://code.google.com/p/msysgit +\li git http://git-scm.com/downloads \li cmake (>= 2.6.3) http://www.cmake.org/cmake/resources/software.html -\li boost (>= 1.35) http://www.boostpro.com/download -\li cppunit (>= 1.9.14) http://gaiacrtn.free.fr/cppunit/index.html -\li fftw3f (>= 3.0.1) http://www.fftw.org/install/windows.html +\li boost (>= 1.35) http://www.boost.org/users/download/ +\li cppunit (>= 1.9.14) http://freedesktop.org/wiki/Software/cppunit/ +\li fftw3f (>= 3.0.1) http://www.fftw.org/download.html \subsection dep_python Python Wrappers \li python (>= 2.5) http://www.python.org/download/ @@ -176,7 +176,7 @@ If not specified, the "Release" mode is the default. Here are som other potentially helpful CMake flags. These are to help you specifically locate certain dependencies. While the CMake scripts themselves should generally find these for us, we can use these to help direct CMake to specific locations if we have installed a different version elsewhere on the system that CMake doesn't know about. -\li QWT_LIBRARIES: shared library to use for Qwt (in the form <path>/libqwt.so). +\li QWT_LIBRARIES: shared library to use for Qwt (in the form \<path\>/libqwt.so). \li QWT_INCLUDE_DIRS: path to Qwt include files (e.g., /usr/include/qwt). \li PYTHON_EXECUTABLE: Location of the 'python' binary you want to use (e.g., /usr/bin/python2.7). \li PYTHON_INCLUDE_PATH: path to Python include files (e.g., /usr/include/python2.7). |