Skip to content

Commit 72b47ce

Browse files
committed
issue doxygen#11416 CMake: Error in doc_internal/CMakeLists.txt:22 Problem configuring file
Fixed usage of `CMAKE_SOURCE_DIR` versus `CMAKE_CURRENT_SOURCE_DIR` so doxygen can be used as "cloned sub-project"
1 parent 9d722c2 commit 72b47ce

File tree

3 files changed

+16
-16
lines changed

3 files changed

+16
-16
lines changed

cmake/WindowsEncoding.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
if(CMAKE_C_COMPILER_ID STREQUAL "MSVC" OR CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
22
include(FindPythonInterp)
33
execute_process(
4-
COMMAND ${Python_EXECUTABLE} "${CMAKE_SOURCE_DIR}/cmake/QueryCodePage.py"
5-
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
4+
COMMAND ${Python_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/QueryCodePage.py"
5+
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
66
RESULT_VARIABLE ReturnCode
77
OUTPUT_VARIABLE CodePage
88
)

doc_internal/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ else()
1919
find_package(Doxygen)
2020
endif()
2121

22-
configure_file(${CMAKE_SOURCE_DIR}/doc_internal/Doxyfile.in "${CMAKE_CURRENT_BINARY_DIR}/Doxyfile" @ONLY)
22+
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in "${CMAKE_CURRENT_BINARY_DIR}/Doxyfile" @ONLY)
2323

2424
set(DOC_FILES
2525
language.tpl

doc_internal/Doxyfile.in

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ PROJECT_NAME = Doxygen
88
PROJECT_NUMBER =
99
PROJECT_BRIEF =
1010
PROJECT_LOGO =
11-
PROJECT_ICON = @CMAKE_SOURCE_DIR@/templates/icon/doxygen.ico
11+
PROJECT_ICON = @CMAKE_CURRENT_SOURCE_DIR@/../templates/icon/doxygen.ico
1212
OUTPUT_DIRECTORY = @PROJECT_BINARY_DIR@/doxygen_docs
1313
CREATE_SUBDIRS = YES
1414
CREATE_SUBDIRS_LEVEL = 8
@@ -20,8 +20,8 @@ ABBREVIATE_BRIEF =
2020
ALWAYS_DETAILED_SEC = NO
2121
INLINE_INHERITED_MEMB = NO
2222
FULL_PATH_NAMES = YES
23-
STRIP_FROM_PATH = @CMAKE_SOURCE_DIR@
24-
STRIP_FROM_INC_PATH = @CMAKE_SOURCE_DIR@
23+
STRIP_FROM_PATH = @CMAKE_CURRENT_SOURCE_DIR@/..
24+
STRIP_FROM_INC_PATH = @CMAKE_CURRENT_SOURCE_DIR@/..
2525
SHORT_NAMES = NO
2626
JAVADOC_AUTOBRIEF = YES
2727
JAVADOC_BANNER = NO
@@ -115,15 +115,15 @@ WARN_LOGFILE =
115115
#---------------------------------------------------------------------------
116116
# Configuration options related to the input files
117117
#---------------------------------------------------------------------------
118-
INPUT = @CMAKE_SOURCE_DIR@/doc_internal/doxygen.md \
118+
INPUT = @CMAKE_CURRENT_SOURCE_DIR@/doxygen.md \
119119
@PROJECT_BINARY_DIR@/doc_internal/commands_history.md \
120-
@CMAKE_SOURCE_DIR@/doc_internal/commands_internal.md \
121-
@CMAKE_SOURCE_DIR@/doc_internal/releases.md \
120+
@CMAKE_CURRENT_SOURCE_DIR@/commands_internal.md \
121+
@CMAKE_CURRENT_SOURCE_DIR@/releases.md \
122122
@PROJECT_BINARY_DIR@/doc_internal/tags_history.md \
123123
@PROJECT_BINARY_DIR@/doc_internal/translator_report.md \
124-
@CMAKE_SOURCE_DIR@/src \
125-
@CMAKE_SOURCE_DIR@/vhdlparser \
126-
@CMAKE_SOURCE_DIR@/libxml
124+
@CMAKE_CURRENT_SOURCE_DIR@/../src \
125+
@CMAKE_CURRENT_SOURCE_DIR@/../vhdlparser \
126+
@CMAKE_CURRENT_SOURCE_DIR@/../libxml
127127
INPUT_ENCODING = UTF-8
128128
INPUT_FILE_ENCODING =
129129
FILE_PATTERNS = *.h \
@@ -172,7 +172,7 @@ HTML_FILE_EXTENSION = .html
172172
HTML_HEADER =
173173
HTML_FOOTER =
174174
HTML_STYLESHEET =
175-
HTML_EXTRA_STYLESHEET = @CMAKE_SOURCE_DIR@/doc_internal/doc_internal.css
175+
HTML_EXTRA_STYLESHEET = @CMAKE_CURRENT_SOURCE_DIR@/doc_internal.css
176176
HTML_EXTRA_FILES =
177177
HTML_COLORSTYLE = TOGGLE
178178
HTML_COLORSTYLE_HUE = 220
@@ -305,9 +305,9 @@ ENABLE_PREPROCESSING = YES
305305
MACRO_EXPANSION = YES
306306
EXPAND_ONLY_PREDEF = YES
307307
SEARCH_INCLUDES = YES
308-
INCLUDE_PATH = @CMAKE_SOURCE_DIR@/deps/libmd5 \
309-
@CMAKE_SOURCE_DIR@/deps/liblodepng \
310-
@CMAKE_SOURCE_DIR@/deps/libmscgen
308+
INCLUDE_PATH = @CMAKE_CURRENT_SOURCE_DIR@/../deps/libmd5 \
309+
@CMAKE_CURRENT_SOURCE_DIR@/../deps/liblodepng \
310+
@CMAKE_CURRENT_SOURCE_DIR@/../deps/libmscgen
311311
INCLUDE_FILE_PATTERNS =
312312
PREDEFINED = DOXYGEN_ONLY
313313
EXPAND_AS_DEFINED = DOC_NODES \

0 commit comments

Comments
 (0)