diff options
| author | Tasuku Suzuki <tasuku.suzuki@signal-slot.co.jp> | 2023-10-17 09:18:58 +0900 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-10-18 00:03:18 +0000 |
| commit | befc13d5dff8035a2ec14876ff32c3c556e567bf (patch) | |
| tree | f167355baa46331e08bb821f2812d08c377885c3 | |
| parent | 581eecd59dcc02579eef337f54337fb4c41efa9a (diff) | |
CMake: Fix Qt toolchain file recursive inclusion
'.' in the regexp must be escaped.
e.g. "/qt/toolchain.cmake" matches "/qt.toolchain.cmake$"
Change-Id: Ib6b66349e1619908a33b4a11d79f7ba19d0e8fdc
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 6544a23603b46c1e2e7c4bd7728ec4dbdb6aec16)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 08e431956a9551312d954d7d91063ee3125bff4b)
| -rw-r--r-- | cmake/QtAutoDetect.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/QtAutoDetect.cmake b/cmake/QtAutoDetect.cmake index 07afc1a896..28d9ac03aa 100644 --- a/cmake/QtAutoDetect.cmake +++ b/cmake/QtAutoDetect.cmake @@ -263,7 +263,7 @@ function(qt_auto_detect_cmake_config) endfunction() function(qt_auto_detect_cyclic_toolchain) - if(CMAKE_TOOLCHAIN_FILE AND CMAKE_TOOLCHAIN_FILE MATCHES "/qt.toolchain.cmake$") + if(CMAKE_TOOLCHAIN_FILE AND CMAKE_TOOLCHAIN_FILE MATCHES "/qt\\.toolchain\\.cmake$") message(FATAL_ERROR "Woah there! You can't use the Qt generated qt.toolchain.cmake file to configure " "qtbase, because that will create a toolchain file that includes itself!\n" |