Skip to content

Commit 7e4e9ab

Browse files
committed
Fixing documentation generation in cmake.
1 parent 8042082 commit 7e4e9ab

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

comms/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
find_package (Doxygen)
22
if (DOXYGEN_FOUND)
3-
set (doc_output_dir "${DOC_INSTALL_DIR}/comms")
4-
make_directory (${doc_output_dir})
3+
set (doc_output_dir "${CMAKE_INSTALL_PREFIX}/${DOC_INSTALL_DIR}/comms")
54

65
set (match_str "OUTPUT_DIRECTORY[^\n]*")
76
set (replacement_str "OUTPUT_DIRECTORY = ${doc_output_dir}")
@@ -13,6 +12,7 @@ if (DOXYGEN_FOUND)
1312
file (WRITE "${output_file}" "${modified_config_text}")
1413

1514
add_custom_target ("doc_comms"
15+
COMMAND ${CMAKE_COMMAND} -E make_directory ${doc_output_dir}
1616
COMMAND ${DOXYGEN_EXECUTABLE} ${output_file}
1717
COMMAND ${CMAKE_COMMAND} -DDOC_OUTPUT_DIR="${doc_output_dir}" -P
1818
${CMAKE_SOURCE_DIR}/cmake/DocCleanupScript.cmake

comms_champion/CMakeLists.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
find_package (Doxygen)
22
if (DOXYGEN_FOUND)
3-
set (doc_output_dir "${DOC_INSTALL_DIR}/comms_champion")
4-
make_directory (${doc_output_dir})
5-
3+
set (doc_output_dir "${CMAKE_INSTALL_PREFIX}/${DOC_INSTALL_DIR}/comms_champion")
64
set (match_str "OUTPUT_DIRECTORY[^\n]*")
75
set (replacement_str "OUTPUT_DIRECTORY = ${doc_output_dir}")
86
set (output_file "${CMAKE_CURRENT_BINARY_DIR}/doxygen.conf")
@@ -13,6 +11,7 @@ if (DOXYGEN_FOUND)
1311
file (WRITE "${output_file}" "${modified_config_text}")
1412

1513
add_custom_target ("doc_commschampion"
14+
COMMAND ${CMAKE_COMMAND} -E make_directory ${doc_output_dir}
1615
COMMAND ${DOXYGEN_EXECUTABLE} ${output_file}
1716
COMMAND ${CMAKE_COMMAND} -DDOC_OUTPUT_DIR="${doc_output_dir}" -P
1817
${CMAKE_SOURCE_DIR}/cmake/DocCleanupScript.cmake

0 commit comments

Comments
 (0)