From 1e15fa5b83cd077108abd4d02dc732f957866d82 Mon Sep 17 00:00:00 2001 From: Olivier Coulaud <Olivier.Coulaud@inria.fr> Date: Tue, 18 Oct 2016 17:46:07 +0200 Subject: [PATCH] Add git clone option to download dscalfmm add bug for scalfmm.png location --- CMakeLists.txt | 1 + Doc/Doxyfile.in | 2 +- Doc/Site_dox/FDownload.dox | 21 +++++++++++++++++---- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6ce3ed3e3..73d047ddc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -951,6 +951,7 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/morse/ # END # ################################################################## + else(MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/morse/") message(STATUS "MORSE_DISTRIB_DIR is not set") diff --git a/Doc/Doxyfile.in b/Doc/Doxyfile.in index 448077949..1b0382a79 100644 --- a/Doc/Doxyfile.in +++ b/Doc/Doxyfile.in @@ -45,7 +45,7 @@ PROJECT_BRIEF = # exceed 55 pixels and the maximum width should not exceed 200 pixels. # Doxygen will copy the logo to the output directory. -PROJECT_LOGO = /home/berenger/Projets/ScalfmmGit/scalfmm/Doc/scalfmm.png +PROJECT_LOGO = @CMAKE_CURRENT_SOURCE_DIR@/scalfmm.png # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff --git a/Doc/Site_dox/FDownload.dox b/Doc/Site_dox/FDownload.dox index a004ea364..3d4f3e496 100644 --- a/Doc/Site_dox/FDownload.dox +++ b/Doc/Site_dox/FDownload.dox @@ -6,8 +6,21 @@ * * \section download Download ScalFMM * -* To download ScalFmm go on https://gforge.inria.fr/frs/?group_id=4479 . -* +* YOu can download two versions of scalfmm either the lastest release or the current development distribution. +* The current release is available at +* <ul> + * <li> https://gforge.inria.fr/frs/?group_id=4479 . + * </ul> + * if you are interested by the the current development distribution you can clone the public release +* <ul> + * <li> git clone https://scm.gforge.inria.fr/anonscm/git/scalfmm-public/scalfmm-public.git + * </ul> +* or use spack to install ScalFMM and all its dependencies (fftw, hwloc,openmpi, ) +* <ul> + * <li> git clone https://github.com/fpruvost/spack.git + * <li> cd spack + * <li> bin/spack install scalfmm + * </ul> * You can stay in touch of the updates and new version by registering * to the users mailing list * (scalfmm-public-users@lists.gforge.inria.fr) which has a very low @@ -18,9 +31,9 @@ * * <ul> * <li> CMake for compiling, ccmake for configuring the build. Version 2.8.12.1 or later </li> - * <li> Open MP </li> - * <li> MPI, if you want to use distributed version of the algorithm (Optional) </li> * <li> A compiler supporting C++ 2011 </li> + * <li> OpenMP compiler</li> + * <li> MPI, if you want to use distributed version of the algorithm (Optional) </li> * <li> BLAS, FFTW, ... (Optionals) </li> * </ul> * -- GitLab