Merge branch 'develop' into ffmpeg-targets

Author: ferdnyc

CMakeLists.txt

@@ -92,14 +92,18 @@ ENDIF(WIN32)
 set(QT_HEADER_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include/Qt)
 FILE(GLOB QT_HEADER_FILES "${QT_HEADER_DIR}/*.h")
 
-############## PROCESS SUB-DIRECTORIES ##############
+############## PROCESS src/ DIRECTORIES ##############
 add_subdirectory(src)
-add_subdirectory(tests)
 
 ################### DOCUMENTATION ###################
 # Find Doxygen (used for documentation)
 include(cmake/Modules/UseDoxygen.cmake)
 
+# Doxygen was found
+if (TARGET doc)
+	message(STATUS "Doxygen found, documentation target enabled")
+	message("\nTo compile documentation in doc/html, run: 'make doc'")
+
 # Install docs, if the user builds them with `make doc`
 install(CODE "MESSAGE(\"Checking for documentation files to install...\")")
 install(CODE "MESSAGE(\"(Compile with 'make doc' command, requires Doxygen)\")")
@@ -108,3 +112,8 @@ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc/html/
         DESTINATION ${CMAKE_INSTALL_DOCDIR}/API
         MESSAGE_NEVER # Don't spew about file copies
         OPTIONAL )    # No error if the docs aren't found
+endif()
+
+############# PROCESS tests/ DIRECTORY ##############
+add_subdirectory(tests)
+