From 1303eea50853c8708a2c7f598a7bec232ce631c3 Mon Sep 17 00:00:00 2001 From: Thomas Braun Date: Sun, 28 Aug 2016 12:57:28 +0200 Subject: [PATCH 1/2] Problem: Broken documentation build Solution: The CMAKE module PythonInterp sets the variable PYTHONINTERP_FOUND and not PYTHON_FOUND if it finds a python interpreter. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6da87943..ccef4352 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -329,7 +329,7 @@ find_package (PythonInterp) find_package (AsciiDoc) cmake_dependent_option (WITH_DOC "Build Reference Guide documentation (requires DocBook)" ON - "PYTHON_FOUND;ASCIIDOC_FOUND" OFF) + "PYTHONINTERP_FOUND;ASCIIDOC_FOUND" OFF) if (MSVC) if (WITH_OPENPGM) From ae08099eb57152a2291d3b71c91baf84bfa3e564 Mon Sep 17 00:00:00 2001 From: Thomas Braun Date: Sun, 28 Aug 2016 13:00:09 +0200 Subject: [PATCH 2/2] Problem: Documentation still has .txt suffix Solution: The regular expression replacement expected a non-existing space at the beginning of the input files. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ccef4352..2df2a636 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -623,7 +623,7 @@ file (MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc) file (GLOB docs RELATIVE ${CMAKE_CURRENT_BINARY_DIR}/ "${CMAKE_CURRENT_SOURCE_DIR}/doc/*.txt") set (html-docs) foreach (txt ${docs}) - string (REGEX REPLACE ".*/ (.*)\\.txt" "\\1.html" html ${txt}) + string (REGEX REPLACE ".*/(.*)\\.txt" "\\1.html" html ${txt}) set (src ${txt}) set (dst doc/${html}) add_custom_command (