New upstream version 2.0.9preupstream/2.0.9pre

1 files changed, 12 insertions, 9 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 63613829..9e265d73 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.0.0)
 cmake_policy(VERSION 3.0.0)
 project(hardinfo2)
 
-set(HARDINFO2_VERSION "2.0.7")
+set(HARDINFO2_VERSION "2.0.9")
 
 option(HARDINFO2_GTK3 "Build for GTK3 (0/off for GTK2)" 1)
 option(HARDINFO2_LIBSOUP3 "Build for libsoup-3.0(EXPERIMENTAL) (0/off for libsoup-2.4)" 0)
@@ -15,11 +15,6 @@ set(DISTRO "" CACHE STRING "Distro build version eg. 1.el(rpm) or 1(deb)")
 SET(CMAKE_MODULE_PATH  "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 include(GNUInstallDirs)
 
-if(${CMAKE_BUILD_TYPE} MATCHES [Dd]ebug)
-	set(HARDINFO2_DEBUG 1)
-	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address")
-endif()
-
 if(${CMAKE_HOST_SYSTEM_NAME} MATCHES "Linux")
 	set(HARDINFO2_OS "linux")
 else()
@@ -78,7 +73,7 @@ message(STATUS "Building HardInfo2 for architecture: ${HARDINFO2_OS}-${HARDINFO2
 
 add_definitions("-std=gnu89")
 #add_definitions("-Wno-deprecated-declarations")
-#add_definitions("-Wextra")
+add_definitions("-Wextra")
 add_definitions("-Wno-missing-field-initializers")
 add_definitions("-Wformat")
 add_definitions("-Wformat-security")
@@ -177,6 +172,13 @@ if(${distro}${disversion} MATCHES "FedoraLinux39")
 endif()
 
 ################################################################################
+if(${CMAKE_BUILD_TYPE} MATCHES [Dd]ebug)
+	set(HARDINFO2_DEBUG 1)
+        if(${distro}${disversion} MATCHES "DebianGNULinux7")
+        else()
+	   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address")
+        endif()
+endif()
 add_subdirectory(po)
 
 
@@ -231,13 +233,14 @@ set(HARDINFO2_MODULES
 set(HARDINFO2_RESOURCES
 	"data/benchmark.data"
 	"data/benchmark.json"
+	"data/blobs-update-version.json"
 	"data/vendor.ids"
 	"data/sdcard.ids"
 	"data/usb.ids"
 	"data/arm.ids"
 	"data/edid.ids"
 	"data/ieee_oui.ids"
-	"data/pci.ids.min"
+	"data/pci.ids"
 	"data/kernel-module-icons.json"
 )
 if(${PACKAGE_MANPAGES})
@@ -332,7 +335,7 @@ set_source_files_properties(
 	hardinfo2/problem_marker.c
 	hardinfo2/hinote_util.c
 	PROPERTIES
-	COMPILE_FLAGS "-std=c99 -Wall -Wextra -Wno-unused-function -Wno-deprecated-declarations -Wno-switch"
+	COMPILE_FLAGS "-std=c99 -Wall -Wextra -Wno-unused-function -Wno-switch"
 )
 
 foreach (_module ${HARDINFO2_MODULES})