From c492078f7742dc72158b689cf6580d2021305da1 Mon Sep 17 00:00:00 2001
From: Nils Wentzell <nwentzell@flatironinstitute.org>
Date: Fri, 26 Apr 2019 12:40:44 -0400
Subject: [PATCH] [doc] Major cleaning of doc targets and CMakeLists.txt

---
 CMakeLists.txt               |  2 +-
 c++/app4triqs/CMakeLists.txt |  2 +-
 doc/CMakeLists.txt           | 60 ++++++++++++++++++++----------------
 3 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 75fcf704..736b0311 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,7 +31,7 @@ find_package(Cpp2Py 1.6 REQUIRED)
 
 # Default Install directory to TRIQS_ROOT if not given or invalid.
 if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT OR (NOT IS_ABSOLUTE ${CMAKE_INSTALL_PREFIX}))
-  message(STATUS " No install prefix given (or invalid). Defaulting to TRIQS_ROOT")
+  message(STATUS "No install prefix given (or invalid). Defaulting to TRIQS_ROOT")
   set(CMAKE_INSTALL_PREFIX ${TRIQS_ROOT} CACHE PATH "default install path" FORCE)
 endif()
 message(STATUS "-------- CMAKE_INSTALL_PREFIX: ${CMAKE_INSTALL_PREFIX} --------")
diff --git a/c++/app4triqs/CMakeLists.txt b/c++/app4triqs/CMakeLists.txt
index f1c3abe8..53e038b5 100644
--- a/c++/app4triqs/CMakeLists.txt
+++ b/c++/app4triqs/CMakeLists.txt
@@ -5,7 +5,7 @@ add_library(app4triqs_c ${sources})
 target_link_libraries(app4triqs_c PUBLIC triqs)
 
 # Configure compilation
-target_compile_options(app4triqs_c PUBLIC -std=c++17 -fPIC)
+target_compile_options(app4triqs_c PUBLIC -fPIC)
 target_include_directories(app4triqs_c PUBLIC $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/c++>)
 target_compile_definitions(app4triqs_c PUBLIC
 				APP4TRIQS_GIT_HASH=${APP4TRIQS_GIT_HASH}
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index d3e766f7..2c1e3366 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -4,42 +4,48 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/conf.py.in ${CMAKE_CURRENT_BINARY_DIR
 # ---------------------------------
 # Top Sphinx target
 # ---------------------------------
-# Sources
-file(GLOB_RECURSE sources *.rst)
+# Sphinx has internal caching, always run it
+add_custom_target(docs_sphinx ALL)
+add_custom_command(
+  TARGET docs_sphinx
+  COMMAND PYTHONPATH=${CMAKE_BINARY_DIR}/python:$ENV{PYTHONPATH} ${TRIQS_SPHINXBUILD_EXECUTABLE} -c . -j8 -b html ${CMAKE_CURRENT_SOURCE_DIR} html
+)
 
-set(sphinx_top ${CMAKE_CURRENT_BINARY_DIR}/html/contents.html)
-add_custom_command(OUTPUT ${sphinx_top} DEPENDS ${sources}
-  COMMAND PYTHONPATH=${CMAKE_BINARY_DIR}/python:$ENV{PYTHONPATH} ${TRIQS_SPHINXBUILD_EXECUTABLE} -c . -j8 -b html ${CMAKE_CURRENT_SOURCE_DIR} html)
-add_custom_target(docs_sphinx ALL DEPENDS ${sphinx_top} ${CMAKE_CURRENT_BINARY_DIR})
-
-# Application must be compiled first
-add_dependencies(docs_sphinx app4triqs_c toto_module)
+# Autodoc usage requires the python modules to be built first
+get_property(CPP2PY_MODULES_LIST GLOBAL PROPERTY CPP2PY_MODULES_LIST)
+add_dependencies(docs_sphinx ${CPP2PY_MODULES_LIST})
 
 # -----------------------------------------------------------------------------
-# Make an optional target that allows us to regenerate the C++ doc with c++2rst
+# Create an optional target that allows us to regenerate the C++ doc with c++2rst
 # -----------------------------------------------------------------------------
-add_custom_target(docs_cpp2rst)
-
-get_property(TRIQS_INCLUDE_DIRS TARGET triqs PROPERTY INTERFACE_INCLUDE_DIRECTORIES)
-get_property(APP4TRIQS_INCLUDE_DIRS TARGET app4triqs_c PROPERTY INTERFACE_INCLUDE_DIRECTORIES)
-set(CPP2RST_INCLUDE_DIRS ${TRIQS_INCLUDE_DIRS} ${APP4TRIQS_INCLUDE_DIRS})
-
-foreach(I ${CPP2RST_INCLUDE_DIRS})
-  set (CPP2RST_INCLUDE_COMMAND ${CPP2RST_INCLUDE_COMMAND} --includes ${I})
+foreach(t app4triqs_c triqs)
+  get_property(INCLUDE_DIRS TARGET ${t} PROPERTY INTERFACE_INCLUDE_DIRECTORIES)
+  get_property(SYSTEM_INCLUDE_DIRS TARGET ${t} PROPERTY INTERFACE_SYSTEM_INCLUDE_DIRECTORIES)
+  if(SYTEM_INCLUDE_DIRS)
+    list(REMOVE_ITEM INCLUDE_DIRS ${SYSTEM_INCLUDE_DIRS})
+  endif()
+  foreach(DIR ${INCLUDE_DIRS})
+    set(CPP2RST_INCLUDE_FLAGS ${CPP2RST_INCLUDE_FLAGS} -I${DIR})
+  endforeach()
+  foreach(DIR ${SYSTEM_INCLUDE_DIRS})
+    set(CPP2RST_INCLUDE_FLAGS ${CPP2RST_INCLUDE_FLAGS} -isystem=${DIR})
+  endforeach()
+  get_property(COMPILE_OPTIONS TARGET ${t} PROPERTY INTERFACE_COMPILE_OPTIONS)
+  set(CPP2RST_CXXFLAGS ${CPP2RST_CXXFLAGS} ${COMPILE_OPTIONS})
 endforeach()
 
+add_custom_target(docs_cpp2rst)
 macro(generate_docs header_file)
   add_custom_command(
     TARGET docs_cpp2rst
-    COMMAND c++2rst
-    ${header_file}
-    -N app4triqs
-    --output_directory ${CMAKE_CURRENT_SOURCE_DIR}/cpp2rst_generated
-    ${CPP2RST_INCLUDE_COMMAND}
-    --cxxflags="-std=c++17"
-    -I ${CMAKE_SOURCE_DIR}/c++
-    -I ${TRIQS_ROOT}/include
-    2>&1 >> cpp2rst.log
+    COMMAND rm -rf ${CMAKE_CURRENT_SOURCE_DIR}/cpp2rst_generated
+    COMMAND
+      c++2rst
+      ${header_file}
+      -N app4triqs
+      --output_directory ${CMAKE_CURRENT_SOURCE_DIR}/cpp2rst_generated
+      --cxxflags="${CPP2RST_CXXFLAGS}"
+      ${CPP2RST_INCLUDE_FLAGS}
   )
 endmacro(generate_docs)