summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2021-05-23 14:57:08 +0200
committerSlávek Banko <slavek.banko@axis.cz>2021-05-23 14:57:08 +0200
commite6dccd3173c574e015b7fb0bea08b4339061f570 (patch)
tree4351d67a85cea0ceb43690fca70012188f986702
parent2d10834c46559c0341fd7d02b90429a86ac1c463 (diff)
downloaddbus-1-tqt-e6dccd3173c574e015b7fb0bea08b4339061f570.tar.gz
dbus-1-tqt-e6dccd3173c574e015b7fb0bea08b4339061f570.zip
Instead of unusual use of full destination path for apidox in build directory, use simple 'apidocs'.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rw-r--r--CMakeLists.txt3
-rw-r--r--dbus-1-tqt.Doxyfile.cmake2
-rw-r--r--src/CMakeLists.txt13
3 files changed, 8 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 93790a1..b585372 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -68,9 +68,8 @@ add_definitions(
if( CMAKE_APIDOX_HTML_DIRECTORY )
set( APIDOX_HTML_DIRECTORY "${CMAKE_APIDOX_HTML_DIRECTORY}" )
else()
- set( APIDOX_HTML_DIRECTORY "usr/share/doc/libdbus-1-tqt/HTML" )
+ set( APIDOX_HTML_DIRECTORY "/usr/share/doc/lib${PROJECT_NAME}/HTML" )
endif()
-set( APIDOX_DIRECTORY "${CMAKE_BINARY_DIR}/${APIDOX_HTML_DIRECTORY}/en" )
##### source directories ########################
diff --git a/dbus-1-tqt.Doxyfile.cmake b/dbus-1-tqt.Doxyfile.cmake
index 396e8f2..d725e49 100644
--- a/dbus-1-tqt.Doxyfile.cmake
+++ b/dbus-1-tqt.Doxyfile.cmake
@@ -38,7 +38,7 @@ PROJECT_NUMBER = 1.0
# If a relative path is entered, it will be relative to the location
# where doxygen was started. If left blank the current directory will be used.
-OUTPUT_DIRECTORY = ${APIDOX_DIRECTORY}
+OUTPUT_DIRECTORY = apidocs
# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
# 4096 sub-directories (in 2 levels) under the output directory of each output
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 19a67a3..c09379a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,4 +1,4 @@
- #################################################
+#################################################
#
# (C) 2010-2011 Serghei Amelian
# serghei (DOT) amelian (AT) gmail.com
@@ -62,20 +62,19 @@ tde_add_executable( dbusxml2qt3
##### add apidox targets ############
add_custom_target( apidox
- COMMAND test -d ${APIDOX_DIRECTORY} || mkdir -p ${APIDOX_DIRECTORY}
COMMAND doxygen ${CMAKE_BINARY_DIR}/dbus-1-tqt.Doxyfile
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
- )
+)
add_custom_target( install-apidox
- COMMAND ${CMAKE_COMMAND} -E echo Apidox installed in /${APIDOX_HTML_DIRECTORY}
+ COMMAND ${CMAKE_COMMAND} -E echo Apidox installed in ${APIDOX_HTML_DIRECTORY}
)
install( CODE "
- if( EXISTS ${CMAKE_BINARY_DIR}/${APIDOX_HTML_DIRECTORY} )
+ if( EXISTS ${CMAKE_BINARY_DIR}/apidocs )
file(
- INSTALL ${CMAKE_BINARY_DIR}/${APIDOX_HTML_DIRECTORY}/en
- DESTINATION /${APIDOX_HTML_DIRECTORY}
+ INSTALL ${CMAKE_BINARY_DIR}/apidocs/
+ DESTINATION ${APIDOX_HTML_DIRECTORY}/en
)
endif()"
)