diff --git a/CMakeLists.txt b/CMakeLists.txt
index c4c2ca7..75f1a54 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -62,10 +62,18 @@ ExternalProject_Add(whereami
 add_breathe_target(
   TARGET_NAME doc-breathe
   SOURCE_DIR ${CMAKE_SOURCE_DIR}/doc/html
-  BUILD_DIR  ${CMAKE_BINARY_DIR}
-  CACHE_DIR  ${CMAKE_BINARY_DIR}/_doctrees
-  HTML_DIR   ${CMAKE_BINARY_DIR}/html
   DOXY_FILE  ${CMAKE_SOURCE_DIR}/doc/html/Doxyfile.in
   CONF_FILE  ${CMAKE_SOURCE_DIR}/doc/html/conf.py.in
+  CACHE_DIR  ${CMAKE_BINARY_DIR}/_doctrees
+  BUILD_DIR  ${CMAKE_BINARY_DIR}/doc/breathe
+  HTML_DIR   ${CMAKE_BINARY_DIR}/doc/breathe
   COMMENT "Documentation in HTML format with Breathe generator"
   )
+
+add_doxygen_target(
+  TARGET_NAME doc-doxygen
+  DOXY_FILE          ${CMAKE_SOURCE_DIR}/doc/html/Doxyfile.in
+  OUTPUT_DIRECTORY   ${CMAKE_BINARY_DIR}/doc
+  HTML               YES
+  LATEX              YES
+  )
diff --git a/cmake/cmlib b/cmake/cmlib
index 45d7f70..f630318 160000
--- a/cmake/cmlib
+++ b/cmake/cmlib
@@ -1 +1 @@
-Subproject commit 45d7f7054d8228fddc296033e09d698a01d9e0b2
+Subproject commit f630318d674b4bb0e379329f34228a4aedd98032
diff --git a/doc/html/Doxyfile.in b/doc/html/Doxyfile.in
index 679470c..60291ac 100644
--- a/doc/html/Doxyfile.in
+++ b/doc/html/Doxyfile.in
@@ -8,7 +8,7 @@ PROJECT_NAME           = @PROJECT_NAME@
 PROJECT_NUMBER         =
 PROJECT_BRIEF          =
 PROJECT_LOGO           =
-OUTPUT_DIRECTORY       =
+OUTPUT_DIRECTORY       = @OUTPUT_DIRECTORY@
 CREATE_SUBDIRS         = NO
 ALLOW_UNICODE_NAMES    = NO
 OUTPUT_LANGUAGE        = Russian
@@ -193,7 +193,7 @@ IGNORE_PREFIX          =
 #---------------------------------------------------------------------------
 # Configuration options related to the HTML output
 #---------------------------------------------------------------------------
-GENERATE_HTML          = NO
+GENERATE_HTML          = @GENERATE_HTML@
 HTML_OUTPUT            = html
 HTML_FILE_EXTENSION    = .html
 HTML_HEADER            =
@@ -251,7 +251,7 @@ EXTRA_SEARCH_MAPPINGS  =
 #---------------------------------------------------------------------------
 # Configuration options related to the LaTeX output
 #---------------------------------------------------------------------------
-GENERATE_LATEX         = NO
+GENERATE_LATEX         = @GENERATE_LATEX@
 LATEX_OUTPUT           = latex
 LATEX_CMD_NAME         = latex
 MAKEINDEX_CMD_NAME     = makeindex
@@ -290,7 +290,7 @@ MAN_LINKS              = NO
 #---------------------------------------------------------------------------
 # Configuration options related to the XML output
 #---------------------------------------------------------------------------
-GENERATE_XML           = YES
+GENERATE_XML           = @GENERATE_XML@
 XML_OUTPUT             = xml
 XML_PROGRAMLISTING     = YES
 #---------------------------------------------------------------------------
diff --git a/doc/html/conf.py.in b/doc/html/conf.py.in
index 4cb1b79..994bc3f 100644
--- a/doc/html/conf.py.in
+++ b/doc/html/conf.py.in
@@ -158,7 +158,7 @@ texinfo_documents = [
      'One line description of project.', 'Miscellaneous'),
 ]
 
-breathe_projects = {'@PROJECT_NAME@': '@BREATHE_DOC_BUILD_DIR@/xml'}
+breathe_projects = {'@PROJECT_NAME@': '@BREATHE_DOCS_BUILD_DIR@/xml'}
 
 
 def run_doxygen(folder):
@@ -174,7 +174,7 @@ def run_doxygen(folder):
 
 
 def setup(app):
-    run_doxygen('@BREATHE_DOC_BUILD_DIR@')
+    run_doxygen('@BREATHE_DOCS_BUILD_DIR@')
     app.add_config_value('recommonmark_config', {
         'enable_auto_toc_tree': True,
         'enable_eval_rst': True,