mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-24 18:58:08 -07:00
db9c0e8b3b
by applying the upstream patch to expand the glob. Affter the minimum required CMake version was raised from 2.8 to 3.5 in the last commit, Ninja reports: > ninja: error: 'doc/Doxyfile*', needed by 'doc/html', missing and no known rule to make it Closes: https://bugs.gentoo.org/956433 Signed-off-by: Z. Liu <zhixu.liu@gmail.com> Part-of: https://github.com/gentoo/gentoo/pull/42735 Closes: https://github.com/gentoo/gentoo/pull/42735 Signed-off-by: Sam James <sam@gentoo.org>
42 lines
1.5 KiB
Diff
42 lines
1.5 KiB
Diff
https://github.com/Tencent/rapidjson/commit/bbdf5d1d4b40891c82e5c1946d32dfc841926066
|
|
|
|
From bbdf5d1d4b40891c82e5c1946d32dfc841926066 Mon Sep 17 00:00:00 2001
|
|
From: Christopher Warrington <chwarr@microsoft.com>
|
|
Date: Tue, 5 Sep 2017 16:58:09 -0700
|
|
Subject: [PATCH] Fix Windows doc build MSBuild error MSB6001
|
|
|
|
When using a MSBuild-based CMake generator like 'Visual Studio 15 2017
|
|
Win64', the doc build was failing with the error 'MSB6001: Invalid
|
|
command line switch for "cmd.exe". Illegal characters in path.'
|
|
|
|
This was due to the dependency on Doxyfile*, which wasn't expanded by
|
|
CMake.
|
|
|
|
The fix is to expand this glob in CMake before specifying the custom
|
|
command's dependencies.
|
|
|
|
Partial fix for https://github.com/miloyip/rapidjson/issues/622
|
|
|
|
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
|
|
index c1f165a3..c5345ba6 100644
|
|
--- a/doc/CMakeLists.txt
|
|
+++ b/doc/CMakeLists.txt
|
|
@@ -10,11 +10,13 @@ ELSE()
|
|
CONFIGURE_FILE(Doxyfile.in Doxyfile @ONLY)
|
|
CONFIGURE_FILE(Doxyfile.zh-cn.in Doxyfile.zh-cn @ONLY)
|
|
|
|
+ file(GLOB DOXYFILES ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile*)
|
|
+
|
|
add_custom_command(OUTPUT html
|
|
COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
|
|
COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile.zh-cn
|
|
COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/html
|
|
- DEPENDS ${MARKDOWN_DOC} ${SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile*
|
|
+ DEPENDS ${MARKDOWN_DOC} ${SOURCES} ${DOXYFILES}
|
|
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/../
|
|
)
|
|
|
|
--
|
|
2.45.2
|
|
|