Automatic apidox installation using CMake code #28
Merged
SlavekB
merged 2 commits from feat/cmake-install-apidox
into master
3 years ago
Loading…
Reference in new issue
There is no content yet.
Delete Branch 'feat/cmake-install-apidox'
Deleting a branch is permanent. It CANNOT be undone. Continue?
Although creating apidox still requires admin module, this does not apply here because a simple doxygen call is used. However, here is the second problem – the script
install_apidox
that is located in the cmake folder is used for apidox installation. This makes it impossible to remove the CMake submodule.In fact, the installation of apidox is simple to copy the folder. Therefore, it seems a good idea to replace it with the CMake code. However, here is a complication that we cannot use common
install(...)
because apidox is not built in all cases. I tested two possible solutions:file(...)
.install(...)
if an apidox building is performed. Benefits are that it does not need a separate script and this is naturally included in the installation of all other files. At the same time, defining and calling make targetapidox_install
becomes unnecessary. It is only defined to maintain compatibility for apidox processing with admin module.In this pull-request you can see the second of these solutions.
Slavek, you are genius :) in cmake - respect.
To me it looks good and as far as I understand, it can be reused everywhere.
Looks good
Yes, I successfully tested it in tdelibs and tdebase. I'm currently preparing to replace the
cmake/generate_apidox
script using CMake code and it seems to be functional. However, there is still a need to prepare a replacement foradmin/doxygen.sh
and other doxygen related files from admin module to finally cancel the need to keep admin module and Makefile.am files. This will be a challenging task but an essential task.I added a second patch that replaces the strange use of the full destination path in build directory. At the same time, the optional build option
CMAKE_APIDOX_HTML_DIRECTORY
is now entered naturally, including the slash.Get FTBFS with latest commit.
Tested removing CMAKE_APIDOX_HTML_DIRECTORY from debian/rules.
Builds fine and contents are the same as the ones without PR.
Reapproved
e6dccd3173
into master 3 years agoReviewers
e6dccd3173
.