From fc3e0885a67c253022de31c1feac53980e4c994f Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Mon, 4 Jul 2022 15:20:26 +0200 Subject: [PATCH] CMake: Fix missing include directories from qmake support files The include paths in QMAKE_INCDIR_FOO entries in qt_lib_XXX.pri files are filtered to not contain implicit include directories. We must enclose the regular expression with ^...$ to avoid catching too many paths like any subdirectory of /usr/include. Fixes: QTBUG-104736 Change-Id: I2d40e6ec6d3f3421d591fed90b4dd9ebbbeb59f4 Reviewed-by: Alexandru Croitor --- cmake/QtPriHelpers.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/QtPriHelpers.cmake b/cmake/QtPriHelpers.cmake index 71164c67183..1a06ca13591 100644 --- a/cmake/QtPriHelpers.cmake +++ b/cmake/QtPriHelpers.cmake @@ -11,7 +11,7 @@ function(qt_generate_qmake_libraries_pri_content module_name output_root_dir out set(implicit_include_dirs_regex "") foreach(dir ${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES}) qt_re_escape(regex "${dir}") - list(APPEND implicit_include_dirs_regex ${regex}) + list(APPEND implicit_include_dirs_regex "^${regex}$") endforeach() list(JOIN implicit_include_dirs_regex "|" implicit_include_dirs_regex)