Filter more properly the doxygen doc when excluding C++ doc/static lib to keep...

Filter more properly the doxygen doc when excluding C++ doc/static lib to keep only Python and/or Matlab wrapper doc.

Certain files needed for Python or Matlab doc were missing with previous way to proceed.

CMakeLists.txt

@@ -712,19 +712,7 @@ if(${BUILD_DOCUMENTATION})
 		string(REGEX REPLACE "(.*)/lib/?.*" "\\1/share/faust/doc" DOC_INSTALL_PREFIX ${FAUST_INSTALL_LIB})
 	endif()
 	install(FILES ${PROJECT_SOURCE_DIR}/license.txt ${PROJECT_SOURCE_DIR}/license_matio.txt DESTINATION ${DOC_INSTALL_PREFIX})
-	if(NOT ${EXCLUDE_FAUST_LIB_INSTALL})
-		install(DIRECTORY "${PROJECT_BINARY_DIR}/doc/html" DESTINATION "${DOC_INSTALL_PREFIX}")
-	else()
-		if(${BUILD_WRAPPER_PYTHON})
-		    install(DIRECTORY "${PROJECT_BINARY_DIR}/doc/html" DESTINATION
-			${DOC_INSTALL_PREFIX} FILES_MATCHING PATTERN "classFaustPy*" PATTERN "FaustPy*" PATTERN "README.html")
-		endif()
-		if(${BUILD_WRAPPER_MATLAB})
-		    install(DIRECTORY "${PROJECT_BINARY_DIR}/doc/html" DESTINATION
-			${DOC_INSTALL_PREFIX} FILES_MATCHING PATTERN "classFaust*" PATTERN "Faust_8m*" PATTERN "README.html")
-
-		endif()
-	endif()
+	install(DIRECTORY "${PROJECT_BINARY_DIR}/doc/html" DESTINATION "${DOC_INSTALL_PREFIX}")
 endif()
 
 

gen_doc/CMakeLists.txt

@@ -3,6 +3,15 @@
 if(BUILD_DOCUMENTATION)
 	find_package(Doxygen)
 	if(DOXYGEN_FOUND)
+		if(NOT ${EXCLUDE_FAUST_LIB_INSTALL})
+			string(CONCAT DOXYGEN_FILE_PATTERNS "*.cpp *.hpp *.h *.cu *.hu")
+		endif()
+		if(BUILD_WRAPPER_MATLAB)
+			string(CONCAT DOXYGEN_FILE_PATTERNS ${DOXYGEN_FILE_PATTERNS} " Faust.m")
+		endif()
+		if(BUILD_WRAPPER_PYTHON)
+			string(CONCAT DOXYGEN_FILE_PATTERNS ${DOXYGEN_FILE_PATTERNS} " FaustPy.py")
+		endif()
 		configure_file(${FAUST_DOC_SRC_DIR}/Doxyfile.in ${PROJECT_BINARY_DIR}/doc/Doxyfile @ONLY)
 		# ./gen_doc/images/* files is duplicated in doc/html/ to call images documentation in the source code with relative path of image's files, from build directory.     
 		if(UNIX)

gen_doc/Doxyfile.in

@@ -462,8 +462,7 @@ INPUT			=	"@FAUST_DOC_SRC_DIR@/mainpage.md" \
 					"@FAUST_ALGORITHM_FACTORIZATION_SRC_DIR@" \
 					"@FAUST_BIN_CMDLINE_SRC_DIR@" \
 					"@FAUST_BIN_TEST_SRC_DIR@" \
-					"@FAUST_PYTHON_SRC_DIR@" \
-					"@FAUST_MATLAB_SRC_DIR@"
+					@FAUST_PYTHON_SRC_DIR@ @FAUST_MATLAB_SRC_DIR@
 USE_MDFILE_AS_MAINPAGE = mainpage
 
 INPUT_ENCODING         = UTF-8
@@ -488,14 +487,9 @@ INPUT_ENCODING         = UTF-8
 # *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx 
 # *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm
 
-FILE_PATTERNS          = *.cpp \
-                         *.hpp \
-                         *.h \
-						 *.cu \
-						 *.hu \
-			 FaustPy.py \
-			 Faust.m
-
+#FILE_PATTERNS          = *.cpp *.hpp *.h *.cu *.hu FaustPy.py Faust.m
+#FILE_PATTERNS =  FaustPy.py Faust.m
+FILE_PATTERNS = @DOXYGEN_FILE_PATTERNS@
 
 # The RECURSIVE tag can be used to turn specify whether or not subdirectories 
 # should be searched for input files as well. Possible values are YES and NO.