Merge remote-tracking branch 'app4triqs-remote/4.0.x' into 4.0.x

# Conflicts:
#	doc/conf.py.in
#	doc/doxygen/Doxyfile.in

Author: Wentzell

CMakeLists.txt

@@ -27,6 +27,9 @@ cmake_policy(VERSION ${CMAKE_VERSION})
 project(solid_dmft VERSION 4.0.0 LANGUAGES CXX)
 get_directory_property(IS_SUBPROJECT PARENT_DIRECTORY)
 
+# version displayed in the documentation
+set(BRANCH_FOR_DOC ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.x)
+
 # ############
 # Load TRIQS
 find_package(TRIQS 4.0 REQUIRED)

doc/conf.py.in

@@ -49,7 +49,7 @@ autosummary_generate = True
 autosummary_imported_members = False
 
 project = '@PROJECT_NAME@'
-version = '@PROJECT_VERSION@'
+version = '@BRANCH_FOR_DOC@'
 
 # this makes the current project version available as var in every rst file
 rst_epilog = """