Merge branch '2.6.x' into master

doc/CMakeLists.txt

@@ -38,8 +38,8 @@ add_custom_target(doc ALL
 install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html
         DESTINATION ${INSTALL_MISC_DIR}/doc
         COMPONENT doc)
-if(DOXYGEN_HHC_PROGRAM)
-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/CSFML.chm
+if(DOXYGEN_GENERATE_HTMLHELP)
+    install(FILES ${DOXYGEN_OUTPUT_DIR}/CSFML.chm
             DESTINATION ${INSTALL_MISC_DIR}/doc
             COMPONENT doc)
 endif()