Fixes for running tests and generating docs with cmake

doc/CMakeLists.txt

@@ -26,7 +26,7 @@ add_custom_target(docs
 	COMMAND ${SED} -e "s/\$VERSION/${VERSION}/g" doxygen_manual.tex > ../latex/doxygen_manual.tex
 	COMMAND ${SED} -e "s/\$VERSION/${VERSION}/g" doxygen.sty > ../latex/doxygen.sty
 	COMMAND ${EPSTOPDF} doxygen_logo.eps --outfile=../latex/doxygen_logo.pdf
-        COMMAND ${MAKE} -C ../latex
+        COMMAND ${MAKE} -C ../latex > latex_out.txt
 	DEPENDS doxygen ${PROJECT_BINARY_DIR}/doc/language.doc config.doc
                 "${PROJECT_BINARY_DIR}/man/doxygen.1"
                 "${PROJECT_BINARY_DIR}/man/doxywizard.1"

doc/Doxyfile

@@ -53,3 +53,4 @@ STRIP_CODE_COMMENTS = NO
 HTML_STYLESHEET   = doxygen_manual.css
 ALIASES           = LaTeX="\f$\mbox{\LaTeX}\f$"
 ALIASES          += TeX="\f$\mbox{\TeX}\f$"
+LATEX_BATCHMODE   = YES

testing/CMakeLists.txt

@@ -3,7 +3,7 @@ find_program(DIFF NAMES diff)
 
 add_custom_target(tests
 	COMMENT "Running doxygen tests..."
-        COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/testing/runtests.py --all --inputdir ${CMAKE_SOURCE_DIR}/testing --outputdir ${PROJECT_BINARY_DIR}/testing
+        COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/testing/runtests.py --all --doxygen ${PROJECT_BINARY_DIR}/bin/doxygen --inputdir ${CMAKE_SOURCE_DIR}/testing --outputdir ${PROJECT_BINARY_DIR}/testing
 	DEPENDS doxygen
 )
 

testing/runtests.py

@@ -26,7 +26,7 @@ def compare_ok(self,got_file,expected_file,name):
 			return (True,'%s absent' % expected_file)
 		else:
 			diff = os.popen('diff -u %s %s' % (got_file,expected_file)).read()
-			if diff:
+			if diff and not diff.isspace():
 				return (True,'Difference between generated output and reference:\n%s' % diff)
 		return (False,'')