solstice

commit 410707693d76377b869794cf7195abf18e46e60e
parent d6a29bb50ab1ee89dfefdc55dc4c20887c6d2093
Author: Vincent Forest <vincent.forest@meso-star.com>
Date:   Tue, 20 Jun 2017 14:59:41 +0200

Merge branch 'release-0.2.2'

Diffstat:
M
README.md
 | 
5
+++++
M
cmake/CMakeLists.txt
 | 
2
+-
M
cmake/doc/CMakeLists.txt
 | 
4
++--
M
doc/solstice.1.txt.in
 | 
2
+-

4 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/README.md b/README.md
@@ -60,6 +60,11 @@ informations on CMake.
 
 ## Release notes
 
+### Version 0.2.2
+
+- Fix how the AsciiDoc tool suite is looking for on Windows; it was never found
+  and consequently the documentation was not generated.
+
 ### Version 0.2.1
 
 - Fix the install target on Windows: copy the solstice runtime libraries in the
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -100,7 +100,7 @@ configure_file(${SOLSTICE_SOURCE_DIR}/../doc/solstice.1.txt.in
 ################################################################################
 set(VERSION_MAJOR 0)
 set(VERSION_MINOR 2)
-set(VERSION_PATCH 1)
+set(VERSION_PATCH 2)
 set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
 
 set(SOLSTICE_FILES_SRC
diff --git a/cmake/doc/CMakeLists.txt b/cmake/doc/CMakeLists.txt
@@ -24,7 +24,7 @@ set(SOLSTICE_DOC_DIR ${PROJECT_SOURCE_DIR}/../doc)
 # Look for asciidoc and a2x programs
 ################################################################################
 if(_html)
-  find_program(ASCIIDOC asciidoc)
+  find_program(ASCIIDOC NAMES asciidoc asciidoc.py)
   if(NOT ASCIIDOC)
     unset(_html)
     message(WARNING
@@ -34,7 +34,7 @@ if(_html)
 endif()
 
 if(_roff)
-  find_program(A2X a2x)
+  find_program(A2X NAMES a2x a2x.py)
   if(NOT A2X)
     unset(_roff)
     message(WARNING
diff --git a/doc/solstice.1.txt.in b/doc/solstice.1.txt.in
@@ -171,7 +171,7 @@ OPTIONS
     {@SOLSTICE_ARGS_DEFAULT_CAMERA_UP@}.
 
 *-t* _threads-count_::
-  Hint on the number of threads to use. By default us as many threads as CPU
+  Hint on the number of threads to use. By default use as many threads as CPU
   cores.
 
 *-v*::