feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Revert "Fix documentation build if include paths contain generator expressions"

Browse Source 
This reverts commit 6ec3c8f9c9.

The reason for introducing the function in Utils was already reverted in
91d0bf1993 .

The call of the function was broken, because of instead of passing a
list of includes as a single argument, it passed each include
as a separate argument (the subtle difference between
`${_include_dirs}` and `"${_include_dirs}"` for lists...).
Which subtly breaks the translation update.

Just go back to the original.

Change-Id: If745c434a9ff808e08703c3c1bf1393eb0183236
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Eike Ziller
2024-10-28 10:03:13 +01:00
parent 56b88ab758
commit 2aead74d58
4 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/QtCreatorTranslations.cmake
View File

@@ -1,7 +1,5 @@
# Defines function add_translation_targets
include(${CMAKE_CURRENT_LIST_DIR}/Utils.cmake)
function(_extract_ts_data_from_targets outprefix)
set(_sources "")
set(_includes "")
@@ -20,7 +18,9 @@ function(_extract_ts_data_from_targets outprefix)
if (NOT _skip_translation)
if(_include_dirs)
remove_generator_expressions(_include_dirs ${_include_dirs})
list(FILTER _include_dirs EXCLUDE REGEX "\\$<TARGET_PROPERTY")
list(FILTER _include_dirs EXCLUDE REGEX "\\$<INSTALL_INTERFACE")
list(TRANSFORM _include_dirs REPLACE "\\$<BUILD_INTERFACE:([^>]+)>" "\\1")
list(APPEND _includes ${_include_dirs})
endif()

8
cmake/Utils.cmake
View File

@@ -119,11 +119,3 @@ function(configure_qml_designer Qt6_VERSION)
endif()
endif()
endfunction()
function(remove_generator_expressions out_var list)
set(result ${list})
list(FILTER result EXCLUDE REGEX "\\$<TARGET_PROPERTY")
list(FILTER result EXCLUDE REGEX "\\$<INSTALL_INTERFACE")
list(TRANSFORM result REPLACE "\\$<BUILD_INTERFACE:([^>]+)>" "\\1")
set(${out_var} ${result} PARENT_SCOPE)
endfunction()

2
doc/CMakeLists.txt
View File

@@ -1,7 +1,5 @@
# Generate documentation
include(Utils)
option(BUILD_DEVELOPER_DOCS "Include developer documentation" OFF)
add_feature_info("Include developer documentation" BUILD_DEVELOPER_DOCS "")

2
src/CMakeLists.txt
View File

@@ -91,7 +91,6 @@ file(COPY
${PROJECT_SOURCE_DIR}/cmake/Config.cmake.in
${PROJECT_SOURCE_DIR}/cmake/QtcSeparateDebugInfo.cmake
${PROJECT_SOURCE_DIR}/cmake/QtcSeparateDebugInfo.Info.plist.in
${PROJECT_SOURCE_DIR}/cmake/Utils.cmake
DESTINATION ${CMAKE_BINARY_DIR}/cmake
)
@@ -106,7 +105,6 @@ install(
${PROJECT_SOURCE_DIR}/cmake/Config.cmake.in
${PROJECT_SOURCE_DIR}/cmake/QtcSeparateDebugInfo.cmake
${PROJECT_SOURCE_DIR}/cmake/QtcSeparateDebugInfo.Info.plist.in
${PROJECT_SOURCE_DIR}/cmake/Utils.cmake
${CMAKE_BINARY_DIR}/cmake/QtCreatorConfig.cmake
DESTINATION ${IDE_CMAKE_INSTALL_PATH}/QtCreator
COMPONENT Devel EXCLUDE_FROM_ALL