summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2020-06-10 18:53:28 +0900
committerSlávek Banko <slavek.banko@axis.cz>2020-06-10 18:29:44 +0200
commite148faabf22f5e993ca54141f88d42effb146df8 (patch)
tree753ee07b4e6f48847e4445d585ae7509084cd33c
parent844e2af15716148a62c985b2cec7c1dc1c5c3b7b (diff)
downloadlibr-e148faabf22f5e993ca54141f88d42effb146df8.tar.gz
libr-e148faabf22f5e993ca54141f88d42effb146df8.zip
Fixed FTBFS caused by previous commit.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit e497d55b675cad64ee667e11f989853a8e6594c1)
-rw-r--r--CMakeLists.txt1
-rw-r--r--doc/libr.cfg.cmake (renamed from doc/libr.cfg)5
-rw-r--r--man/CMakeLists.txt3
3 files changed, 4 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 69b25bd..2d4b8a9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -135,3 +135,4 @@ tde_auto_add_subdirectories()
##### write configure files #####################
configure_file( src/config.h.cmake config.h @ONLY )
+configure_file( doc/libr.cfg.cmake doc/libr.cfg @ONLY )
diff --git a/doc/libr.cfg b/doc/libr.cfg.cmake
index c355233..4e4b49a 100644
--- a/doc/libr.cfg
+++ b/doc/libr.cfg.cmake
@@ -38,8 +38,7 @@ PROJECT_NUMBER =
# 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 = ..
-
+OUTPUT_DIRECTORY = @CMAKE_BINARY_DIR@
# 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
# format and will distribute the generated files over these directories.
@@ -568,7 +567,7 @@ WARN_LOGFILE =
# directories like "/usr/src/myproject". Separate the files or directories
# with spaces.
-INPUT = ../src
+INPUT = @CMAKE_SOURCE_DIR@/src
# This tag can be used to specify the character encoding of the source files
# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt
index 589da60..eb94a2b 100644
--- a/man/CMakeLists.txt
+++ b/man/CMakeLists.txt
@@ -9,13 +9,12 @@
#
#################################################
-file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/man3)
add_custom_target( man ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/man3 )
add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/man3
- COMMAND doxygen ../doc/libr.cfg
+ COMMAND doxygen ${CMAKE_BINARY_DIR}/doc/libr.cfg
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
COMMENT "Generate manpages"
)