]>
Commit | Line | Data |
---|---|---|
18c9b130 JB |
1 | --- qtwebkit-5.212.0-alpha4/Source/PlatformQt.cmake.orig 2020-03-04 18:16:37.000000000 +0100 |
2 | +++ qtwebkit-5.212.0-alpha4/Source/PlatformQt.cmake 2020-12-23 20:33:52.256635105 +0100 | |
effa4d27 JB |
3 | @@ -254,22 +254,22 @@ |
4 | set(NEED_ALL "") | |
5 | endif () | |
6 | ||
7 | -set(EXPORT_VARS_COMMANDS | |
8 | - COMMAND ${EXPORT_VAR} "QT_INSTALL_DOCS=${QT_INSTALL_DOCS}" | |
9 | - COMMAND ${EXPORT_VAR} "QT_VER=${PROJECT_VERSION_STRING}" | |
10 | - COMMAND ${EXPORT_VAR} "QT_VERSION=${PROJECT_VERSION_STRING}" | |
11 | - COMMAND ${EXPORT_VAR} "QT_VERSION_TAG=${PROJECT_VERSION_TAG}" | |
12 | +set(EXPORT_VARS | |
13 | + "QT_INSTALL_DOCS=${QT_INSTALL_DOCS}" | |
14 | + "QT_VER=${PROJECT_VERSION_STRING}" | |
15 | + "QT_VERSION=${PROJECT_VERSION_STRING}" | |
16 | + "QT_VERSION_TAG=${PROJECT_VERSION_TAG}" | |
17 | + "BUILDDIR=${CMAKE_BINARY_DIR}" | |
18 | ) | |
19 | +get_target_property(QDOC Qt5::qdoc IMPORTED_LOCATION) | |
20 | ||
21 | add_custom_target(prepare_docs ${NEED_ALL} | |
22 | - ${EXPORT_VARS_COMMANDS} | |
23 | - COMMAND Qt5::qdoc ${QDOC_CONFIG} -prepare -outputdir "${DOC_OUTPUT_DIR}/qtwebkit" -installdir ${DOC_INSTALL_DIR} -indexdir ${QT_INSTALL_DOCS} -no-link-errors | |
24 | + COMMAND ${CMAKE_COMMAND} -E env ${EXPORT_VARS} ${QDOC} ${QDOC_CONFIG} -prepare -outputdir "${DOC_OUTPUT_DIR}/qtwebkit" -installdir ${DOC_INSTALL_DIR} -indexdir ${QT_INSTALL_DOCS} -no-link-errors | |
25 | VERBATIM | |
26 | ) | |
27 | ||
28 | add_custom_target(generate_docs ${NEED_ALL} | |
29 | - ${EXPORT_VARS_COMMANDS} | |
30 | - COMMAND Qt5::qdoc ${QDOC_CONFIG} -generate -outputdir "${DOC_OUTPUT_DIR}/qtwebkit" -installdir ${DOC_INSTALL_DIR} -indexdir ${QT_INSTALL_DOCS} | |
31 | + COMMAND ${CMAKE_COMMAND} -E env ${EXPORT_VARS} ${QDOC} ${QDOC_CONFIG} -generate -outputdir "${DOC_OUTPUT_DIR}/qtwebkit" -installdir ${DOC_INSTALL_DIR} -indexdir ${QT_INSTALL_DOCS} | |
32 | VERBATIM | |
33 | ) | |
34 | add_dependencies(generate_docs prepare_docs) |