From ded397ca559cecb97a6b33f899c4abe8f7aac7da Mon Sep 17 00:00:00 2001 From: Cristian Adam Date: Tue, 18 Jun 2024 16:55:28 +0200 Subject: [PATCH] Sqlite: Fix build with QTC_STATIC_BUILD MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Qt Creator was failing with: ``` In file included from /home/jarek/dev/creator-14-work/src/libs/sqlite/ sqliteexception.h:6, from /home/jarek/dev/creator-14-work/src/libs/sqlite/ sqlitevalue.h:7, from /home/jarek/dev/creator-14-work/src/plugins/ qmldesigner/designercore/projectstorage/projectstorageinfotypes.h:8, from /home/jarek/dev/creator-14-work/src/plugins/ qmldesigner/designercore/projectstorage/projectstoragetypes.h:8, from /home/jarek/dev/creator-14-work/src/plugins/ qmldesigner/designercore/include/propertymetainfo.h:9, from /home/jarek/dev/creator-14-work/src/plugins/ qmldesigner/designercore/include/nodemetainfo.h:6, from /home/jarek/dev/creator-14-work/tests/unit/tests/ printers/gtest-creator-printing.cpp:17: /home/jarek/dev/creator-14-work/src/libs/sqlite/sqlite3_fwd.h:7:7: error: conflicting declaration ‘using sqlite3 = struct qtc_sqlite3’ 7 | using sqlite3 = struct qtc_sqlite3; | ^~~~~~~ ``` Task-number: QTCREATORBUG-30009 Change-Id: Ibc18f16ab304a92f73882c9336eebc2abd54aa44 Reviewed-by: Jarek Kobus --- src/libs/sqlite/CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/libs/sqlite/CMakeLists.txt b/src/libs/sqlite/CMakeLists.txt index f86f31871a4..e0cf3093142 100644 --- a/src/libs/sqlite/CMakeLists.txt +++ b/src/libs/sqlite/CMakeLists.txt @@ -80,5 +80,7 @@ extend_qtc_library(Sqlite extend_qtc_library(Sqlite CONDITION QTC_STATIC_BUILD - PROPERTIES COMPILE_OPTIONS $,/FIsqlite_static_config.h,-includesqlite_static_config.h> + PROPERTIES + COMPILE_OPTIONS $,/FIsqlite_static_config.h,-includesqlite_static_config.h> + INTERFACE_COMPILE_OPTIONS $,/FI../3rdparty/sqlite/sqlite_static_config.h,-include../3rdparty/sqlite/sqlite_static_config.h> )