diff options
author | Craig Scott <craig.scott@qt.io> | 2020-11-27 12:41:21 +1100 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-11-30 22:19:40 +0000 |
commit | 1f443c36f2282510f01446ea0b76b820be2d4295 (patch) | |
tree | 440d0ef2b7519317f98ff3cc6f8ef53e65865baa /cmake | |
parent | 862b967449b46e83550ed01cdd86b98912ae9ee2 (diff) |
CMake: Handle empty INCLUDE_DIRECTORIES in genex for qdoc
Follow the pattern recommended in the CMake docs for the $<JOIN:...>
generator expression. Wrap it in a $<BOOL:...> genex so that if a
target's INCLUDE_DIRECTORIES property is empty, we don't add a
stray -I with no directory following it. This fixes the following error
when running qdoc:
qdoc: Missing value after '-I'.
Task-number: QTBUG-88838
Change-Id: Ie3ef2625fbb29cc501f7fc22ff7a9cc8ac548322
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit bac73a36e25076a5929c7feac0675860772e7270)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'cmake')
-rw-r--r-- | cmake/QtDocsHelpers.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/QtDocsHelpers.cmake b/cmake/QtDocsHelpers.cmake index b5b734f5c4..392969d305 100644 --- a/cmake/QtDocsHelpers.cmake +++ b/cmake/QtDocsHelpers.cmake @@ -65,7 +65,7 @@ function(qt_internal_add_docs) if (NOT target_type STREQUAL "UTILITY") file(GENERATE OUTPUT ${target_include_dirs_file} - CONTENT "-I$<JOIN:${include_paths_property},\n-I>" + CONTENT "$<$<BOOL:${include_paths_property}>:-I$<JOIN:${include_paths_property},\n-I>>" ) set(include_path_args "@${target_include_dirs_file}") else() |