Commit 3bb2737c authored by Edwin Carlinet's avatar Edwin Carlinet

Merge branch 'fix-compilation-gcc9' into 'master'

Fix compilation + doc switch.
 
# Scribo compiles with GCC 9

Scribo in now compiling with GCC 9 with no error.

# Doc configure switch

Documentation build can be disabled with the switch:

```
./configure --enable-doc=no
```

See merge request !3
parents 8546864d ee02495a
...@@ -30,7 +30,9 @@ endif ENABLE_SCRIBO ...@@ -30,7 +30,9 @@ endif ENABLE_SCRIBO
# We rely on Automake to ensure that the documentions are generated in # We rely on Automake to ensure that the documentions are generated in
# the right order. Here, we make sure that the general documentation # the right order. Here, we make sure that the general documentation
# will be generated after Milena's and Scribo's documentation. # will be generated after Milena's and Scribo's documentation.
SUBDIRS += doc if ENABLE_DOC
SUBDIRS += doc
endif ENABLE_DOC
# Target shortcuts delegating the actual action to milena/Makefile. # Target shortcuts delegating the actual action to milena/Makefile.
LOCAL_RECURSIVE_TARGETS = tests LOCAL_RECURSIVE_TARGETS = tests
......
...@@ -170,8 +170,15 @@ fi ...@@ -170,8 +170,15 @@ fi
## Documentation. ## ## Documentation. ##
## --------------- ## ## --------------- ##
# Switch to enable doc
AC_ARG_ENABLE([doc],
[AS_HELP_STRING([--enable-doc],
[build documentation])])
AM_CONDITIONAL([ENABLE_DOC], [test "x$enable_doc" = xyes])
# Tools used to build the documentation. # Tools used to build the documentation.
# rst2html can have many names, especially in the MacPorts, where # rst2html can have many names, especially in the MacPorts, where
# py-docutils binaries include their version numbers in their names. # py-docutils binaries include their version numbers in their names.
AC_ARG_VAR([RST2HTML], [reStructuredText-to-HTML translator]) AC_ARG_VAR([RST2HTML], [reStructuredText-to-HTML translator])
...@@ -215,6 +222,7 @@ AC_ARG_ENABLE([all], ...@@ -215,6 +222,7 @@ AC_ARG_ENABLE([all],
enable_scribo=yes enable_scribo=yes
enable_apps=yes enable_apps=yes
enable_tools=yes enable_tools=yes
enable_doc=yes
fi]) fi])
...@@ -733,6 +741,7 @@ Swilena --enable-swilena $enable_swilena ...@@ -733,6 +741,7 @@ Swilena --enable-swilena $enable_swilena
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Apps --enable-apps $enable_apps Apps --enable-apps $enable_apps
Tools --enable-tools $enable_tools Tools --enable-tools $enable_tools
Doc --enable-doc $enable_doc
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
......
...@@ -15,7 +15,12 @@ ...@@ -15,7 +15,12 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>. # along with Olena. If not, see <http://www.gnu.org/licenses/>.
SUBDIRS = . doc mesh tests
SUBDIRS = . $(DOCDIR) mesh tests
if ENABLE_DOC
SUBDIRS += doc
endif ENABLE_DOC
if ENABLE_APPS if ENABLE_APPS
SUBDIRS += apps SUBDIRS += apps
......
...@@ -15,7 +15,12 @@ ...@@ -15,7 +15,12 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>. # along with Olena. If not, see <http://www.gnu.org/licenses/>.
SUBDIRS = demo doc tests src SUBDIRS = demo $(DOCDIR) tests src
if ENABLE_DOC
SUBDIRS += doc
endif ENABLE_DOC
.PHONY: bin .PHONY: bin
bin: bin:
......
...@@ -170,13 +170,8 @@ namespace scribo ...@@ -170,13 +170,8 @@ namespace scribo
const Image<I>& ima, const char *name); const Image<I>& ima, const char *name);
template <unsigned n, typename I> template <unsigned n, typename I>
void void log_image_dispatch(const value::label<n>&,
log_image_dispatch(const value::label<n>&, const Image<I>& ima, const char *name);
const Image<I>& ima, const char *name);
template <typename I>
void log_image_dispatch(const mln_value(I)&,
const Image<I>& ima, const char *name);
template <typename I> template <typename I>
void log_image_dispatch(const value::rgb8&, void log_image_dispatch(const value::rgb8&,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment