Merge branch 'main' into increase-warning-level

TinyTinni · Nov 7, 2024 · 41c3807 · 41c3807
2 parents 1e8bcfd + dcaf749
commit 41c3807
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -66,7 +66,6 @@ jobs:
         -DBUILD=TESTING=OFF 
         -DBUILD_SHELL=OFF
         -DBUILD_EXTENSIONS="autocomplete"
-        -DCMAKE_COMPILE_WARNING_AS_ERROR=ON
 
     - name: Build Tests
       run: cmake 

diff --git a/QtDuckDBDriver/CMakeLists.txt b/QtDuckDBDriver/CMakeLists.txt
@@ -9,10 +9,7 @@ target_include_directories(QtSqlPrivate INTERFACE "${Qt${QT_VERSION}Sql_PRIVATE_
 set_property(TARGET QtSqlPrivate PROPERTY INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${Qt${QT_VERSION}Sql_PRIVATE_INCLUDE_DIRS}")
 
 include(../cmake/get_cpm.cmake)
-CPMAddPackage(
-    NAME DuckDB
-    "gh:duckdb/duckdb#v1.1.2"
-     OPTIONS "CMAKE_COMPILE_WARNING_AS_ERROR=OFF")
+CPMAddPackage("gh:duckdb/duckdb#v1.1.3")
 
 get_property(duckdb_include_dirs TARGET duckdb_static PROPERTY INTERFACE_INCLUDE_DIRECTORIES)
 set_property(TARGET duckdb_static PROPERTY INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${duckdb_include_dirs}")
@@ -27,13 +24,16 @@ set_property(TARGET QtDuckDBDriver PROPERTY AUTOMOC ON)
 set_property(TARGET QtDuckDBDriver PROPERTY DEBUG_POSTFIX "d")
 set_property(TARGET QtDuckDBDriver PROPERTY INTERPROCEDURAL_OPTIMIZATION TRUE)
 set_property(TARGET QtDuckDBDriver PROPERTY INTERPROCEDURAL_OPTIMIZATION_DEBUG FALSE)
-
-target_compile_options(QtDuckDBDriver PRIVATE
-     $<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>,$<CXX_COMPILER_ID:GNU>>:
-          -Wall -Wextra -Wconversion -pedantic-errors 
-          $<$<NOT:$<STREQUAL:"${QT_VERSION}","5">>:-Wsign-conversion>> # disables sign conversion for qt5 as qt6 is the future and they fixed a lot of data types there
-     $<$<CXX_COMPILER_ID:MSVC>:/W4>
-     )
+set_property(TARGET QtDuckDBDriver PROPERTY COMPILE_WARNING_AS_ERROR ON)
+
+# disables sign conversion for qt5 as qt6 is the future and they fixed a lot of data types there
+if (NOT "${QT_VERSION}" STREQUAL "5")
+    target_compile_options(QtDuckDBDriver PRIVATE
+         $<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>,$<CXX_COMPILER_ID:GNU>>:
+              -Wall -Wextra -Wconversion -pedantic-errors -Wsign-conversion
+         $<$<CXX_COMPILER_ID:MSVC>:/W4>
+         )
+endif()
 
 
 if (NOT WIN32) # seems like duckdb disabled sanitizer on windows build