From e148faabf22f5e993ca54141f88d42effb146df8 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Wed, 10 Jun 2020 18:53:28 +0900 Subject: [PATCH] Fixed FTBFS caused by previous commit. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michele Calgaro Signed-off-by: Slávek Banko (cherry picked from commit e497d55b675cad64ee667e11f989853a8e6594c1) --- CMakeLists.txt | 1 + doc/{libr.cfg => libr.cfg.cmake} | 5 ++--- man/CMakeLists.txt | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) rename doc/{libr.cfg => libr.cfg.cmake} (99%) 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 similarity index 99% rename from doc/libr.cfg rename to 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" )