From 0dca7a1e165cdffa0065455b377d2658f33f4ea2 Mon Sep 17 00:00:00 2001 From: Burt P Date: Sat, 13 Jul 2019 10:08:36 -0500 Subject: vendor.ids update and vendor.{h,c} improvements from sysobj version * more fields in struct Vendor. * match_case -> match_rule and new match rule "exact". match_rule remains compatible with match_case for old conf format. * matches must be "whole word" matches so "Harmony" no longer hits for "ARM". * Parts outside of () are checked first, so "Foo (formerly Barly)" matches Foo before Barly, even though Barly is longer and would otherwise match first. * vendor_list type (a blessed GSList*) and helper functions to manage it. Signed-off-by: Burt P --- CMakeLists.txt | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 2fd2542e..8bbf301c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -97,6 +97,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/includes ${CMAKE_SOURCE_DIR}/includes/${HARDINFO_ARCH} ${CMAKE_SOURCE_DIR}/deps/uber-graph + ${CMAKE_SOURCE_DIR}/deps/sysobj_early/include ${CMAKE_BINARY_DIR} ${GTK_INCLUDE_DIRS} ${LIBSOUP_INCLUDE_DIRS} @@ -212,6 +213,12 @@ foreach (_module ${HARDINFO_MODULES}) set_target_properties(${_module} PROPERTIES PREFIX "") endforeach() +add_library(sysobj_early STATIC + deps/sysobj_early/src/gg_slist.c + deps/sysobj_early/src/strstr_word.c +) +set_target_properties(sysobj_early PROPERTIES COMPILE_FLAGS "-std=c99 -Wall -Wextra -Wno-parentheses -Wno-unused-function") + if (HARDINFO_GTK3) add_library(uber-graph STATIC deps/uber-graph/g-ring.c @@ -267,6 +274,7 @@ add_executable(hardinfo shell/loadgraph-uber.c ) target_link_libraries(hardinfo + sysobj_early uber-graph ${GTK_LIBRARIES} ${LIBSOUP_LIBRARIES} @@ -302,6 +310,7 @@ add_executable(hardinfo shell/loadgraph.c ) target_link_libraries(hardinfo + sysobj_early ${GTK_LIBRARIES} ${LIBSOUP_LIBRARIES} m -- cgit v1.2.3