SFML / CSFML

Official binding of SFML for C
https://www.sfml-dev.org
Other
342 stars 121 forks source link

CMake: Fix installing HTML Help with newer Doxygen version #270

Closed Biswa96 closed 2 weeks ago

Biswa96 commented 3 weeks ago

HTML Help generation was disabled for doxygen version greater than 1.10.0 in df75efa78d41e39427168355659e48f8d2e6e7d8 commit.

eXpl0it3r commented 3 weeks ago

What does this change do exactly?

The disabling was done, because doxygen caused problems with certain parameters when having HTML Help and HTML enabled at the same time.

Biswa96 commented 3 weeks ago

What does this change do exactly?

With newer doxygen, the HTML Help file is not generate and failed to install with the following error.

CMake Error at build/doc/cmake_install.cmake:45 (file):
  file INSTALL cannot find
  "csfml/src/build/doc/CSFML.chm": File
  exists.
Call Stack (most recent call first):
  build/cmake_install.cmake:55 (include)
eXpl0it3r commented 2 weeks ago

Will need to be fixed in SFML as well: image

eXpl0it3r commented 2 weeks ago

As DOXYGEN_GENERATE_HTMLHELP is only set to true when DOXYGEN_HHC_PROGRAM is true, it's redudant to check both, thus I changed it.

Since this was already done on 2.6.1, I've rebased the branch onto 2.6.x and changed the PR target.

eXpl0it3r commented 2 weeks ago

Well the mentioned error is actually about not having the doc target built first, additionally, that was for SFML not CSFML, but I guess that shouldn't matter as much.

image