diff options
| author | Christopher Warrington <chwarr@microsoft.com> | 2017-09-06 02:58:09 +0300 |
|---|---|---|
| committer | Christopher Warrington <chwarr@microsoft.com> | 2017-09-06 02:58:09 +0300 |
| commit | bbdf5d1d4b40891c82e5c1946d32dfc841926066 (patch) | |
| tree | 60da9a8e9f58284f1a61467368825c20b59dfde9 /doc | |
| parent | 1e460910097c812aab46d252b4651f3d8fb1dd2d (diff) | |
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
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/CMakeLists.txt | 4 |
1 files changed, 3 insertions, 1 deletions
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}/../ ) |